diff --git a/.3rd-party/0.2.0/Release_0_2_0.md b/.3rd-party/0.2.0/Release_0_2_0.md deleted file mode 100644 index b7bea87350..0000000000 --- a/.3rd-party/0.2.0/Release_0_2_0.md +++ /dev/null @@ -1,181 +0,0 @@ -# 3rd party dependencies for Release 0.2.0 - -## Eclipse CQs - Provided/compile - -| Group ID | Artifact ID | Version | CQ | -|--------------------------------------|--------------------------------|----------------|------------------------------------------------------------------| -| com.microsoft.sqlserver | mssql-jdbc | 6.4.0 | [CQ15896](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15896) | -| com.cronutils | cron-utils | 5.0.5 | [CQ15762](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15762) | -| com.github.ben-manes.caffeine | caffeine | 2.3.5 | [CQ13563](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13563) | -| aopalliance | aopalliance | 1.0 | [CQ10346](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10346) | -| ch.qos.logback | logback-classic | 1.1.3 | [CQ10347](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10347) | -| ch.qos.logback | logback-core | 1.1.3 | [CQ12925](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12925) | -| com.fasterxml.jackson.core | jackson-annotations | 2.8.2 | [CQ12927](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12927) | -| com.fasterxml.jackson.core | jackson-core | 2.8.2 | [CQ12928](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12928) | -| com.fasterxml.jackson.core | jackson-databind | 2.8.2 | [CQ12930](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12930) | -| com.fasterxml | classmate | 1.3.3 | [CQ10368](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10368) | -| com.github.gwtd3 | gwt-d3-api | 1.2.0 | [CQ13029](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13029) | -| com.github.gwtd3 | gwt-d3-js | 3.5.11 | [CQ13030](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13030) | -| com.google.guava | guava | 25.0-jre | [CQ16201](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16201) | -| com.h2database | h2 | 1.4.186 | [CQ10365](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10365) | -| com.rabbitmq | amqp-client | 4.0.2 | [CQ13041](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13041) | -| com.rabbitmq | http-client | 1.3.1.RELEASE | [CQ15867](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15867) | -| com.vaadin.external.atmosphere | atmosphere-runtime | 2.2.9.vaadin2 | [CQ10714](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10714) | -| com.vaadin.external.flute | flute | 1.3.0.gg2 | [CQ11039](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11039) | -| com.vaadin.external.gwt | gwt-elemental | 2.7.0.vaadin4 | [CQ13031](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13031) | -| com.vaadin.external.gwt | gwt-user | 2.7.0.vaadin4 | [CQ13033](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13033) | -| com.vaadin.external.slf4j | vaadin-slf4j-jdk14 | 1.6.1 | [CQ10715](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10715) | -| com.vaadin | vaadin-client | 7.7.7 | [CQ12956](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12956) | -| com.vaadin | vaadin-push | 7.7.7 | [CQ12957](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12957) | -| com.vaadin | vaadin-sass-compiler | 0.9.12 | [CQ12958](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12958) | -| com.vaadin | vaadin-server | 7.7.7 | [CQ12959](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12959) | -| com.vaadin | vaadin-shared | 7.7.7 | [CQ12960](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12960) | -| com.vaadin | vaadin-spring-boot | 1.1.1 | [CQ12962](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12962) | -| com.vaadin | vaadin-spring | 1.1.1 | [CQ12963](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12963) | -| com.vaadin | vaadin-themes | 7.7.7 | [CQ12961](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12961) | -| commons-codec | commons-codec | 1.10 | [CQ12933](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12933) | -| commons-io | commons-io | 2.4 | [CQ10354](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10354) | -| cz.jirutka.rsql | rsql-parser | 2.1.0 | [CQ12964](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12964) | -| io.protostuff | protostuff-api | 1.5.3 | [CQ12965](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12965) | -| io.protostuff | protostuff-collectionschema | 1.5.3 | [CQ12966](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12966) | -| io.protostuff | protostuff-core | 1.5.3 | [CQ12967](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12967) | -| io.protostuff | protostuff-runtime | 1.5.3 | [CQ12968](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12968) | -| javax.annotation | javax.annotation-api | 1.2 | [CQ12934](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12934) | -| javax.servlet | javax.servlet-api | 3.1.0 | [CQ10362](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10362) | -| javax.transaction | javax.transaction-api | 1.2 | [CQ10363](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10363) | -| javax.validation | validation-api | 1.1.0.Final | [CQ10364](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10364) | -| javax.validation | validation-api | sources | [CQ10364](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10364) | -| javax.websocket | javax.websocket-api | 1.0 | [CQ12943](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12943) | -| org.apache.commons | commons-lang3 | 3.4 | [CQ10356](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10356) | -| org.apache.httpcomponents | httpclient | 4.5.2 | [CQ12941](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12941) | -| org.apache.httpcomponents | httpcore | 4.4.6 | [CQ12942](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12942) | -| org.apache.tomcat.embed | tomcat-embed-el | 8.0.28 | [CQ11060](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11060) | -| org.apache.tomcat | tomcat-jdbc | 8.0.28 | [CQ10617](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10617) | -| org.apache.tomcat | tomcat-juli | 8.0.28 | [CQ10618](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10618) | -| org.flywaydb | flyway-core | 4.0.3 | [CQ12947](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12947) | -| org.glassfish | javax.json | 1.0.4 | [CQ10619](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10619) | -| org.hibernate.validator | hibernate-validator | 6.0.7.Final | [CQ15540](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15540) | -| org.jboss.logging | jboss-logging | 3.2.1.Final | [CQ10621](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10621) | -| org.jsoup | jsoup | 1.8.3 | [CQ12936](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12936) | -| org.ow2.asm | asm-commons | 5.0.1 | [CQ12945](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12945) | -| org.ow2.asm | asm-tree | 5.0.1 | [CQ12945](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12945) | -| org.ow2.asm | asm | 5.0.1 | [CQ12945](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12945) | -| org.slf4j | jcl-over-slf4j | 1.7.22 | [CQ12938](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12938) | -| org.slf4j | jul-to-slf4j | 1.7.22 | [CQ12937](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12937) | -| org.slf4j | log4j-over-slf4j | 1.7.22 | [CQ12939](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12939) | -| org.slf4j | slf4j-api | 1.7.22 | [CQ12940](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12940) | -| org.springframework.amqp | spring-amqp | 1.7.1.RELEASE | [CQ13043](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13043) | -| org.springframework.amqp | spring-rabbit | 1.7.1.RELEASE | [CQ13044](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13044) | -| org.springframework.boot | spring-boot-actuator | 1.4.5.RELEASE | [CQ12992](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12992) | -| org.springframework.boot | spring-boot-autoconfigure | 1.4.5.RELEASE | [CQ12971](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12971) | -| org.springframework.boot | spring-boot-starter-actuator | 1.4.5.RELEASE | [CQ12973](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12973) | -| org.springframework.boot | spring-boot-starter-aop | 1.4.5.RELEASE | [CQ12974](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12974) | -| org.springframework.boot | spring-boot-starter-data-jpa | 1.4.5.RELEASE | [CQ12975](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12975) | -| org.springframework.boot | spring-boot-starter-jdbc | 1.4.5.RELEASE | [CQ12976](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12976) | -| org.springframework.boot | spring-boot-starter-jetty | 1.4.5.RELEASE | [CQ12977](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12977) | -| org.springframework.boot | spring-boot-starter-logging | 1.4.5.RELEASE | [CQ12981](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12981) | -| org.springframework.boot | spring-boot-starter-validation | 1.4.5.RELEASE | [CQ12982](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12982) | -| org.springframework.boot | spring-boot-starter-web | 1.4.5.RELEASE | [CQ12983](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12983) | -| org.springframework.boot | spring-boot-starter | 1.4.5.RELEASE | [CQ12984](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12984) | -| org.springframework.boot | spring-boot | 1.4.5.RELEASE | [CQ12985](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12985) | -| org.springframework.cloud | spring-cloud-bus | 1.2.2.RELEASE | [CQ12986](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12986) | -| org.springframework.cloud | spring-cloud-context | 1.1.8.RELEASE | [CQ12987](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12987) | -| org.springframework.cloud | spring-cloud-stream | 1.1.2.RELEASE | [CQ12989](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12989) | -| org.springframework.data | spring-data-commons | 1.12.8.RELEASE | [CQ12991](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12991) | -| org.springframework.data | spring-data-jpa | 1.10.8.RELEASE | [CQ12972](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12972) | -| org.springframework.hateoas | spring-hateoas | 0.23.0.RELEASE | [CQ12993](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12993) | -| org.springframework.integration | spring-integration-core | 4.3.8.RELEASE | [CQ12994](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12994) | -| org.springframework.integration | spring-integration-jmx | 4.3.8.RELEASE | [CQ12995](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12995) | -| org.springframework.integration | spring-integration-tuple | 1.0.0.RELEASE | [CQ12996](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12996) | -| org.springframework.plugin | spring-plugin-core | 1.2.0.RELEASE | [CQ12997](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12997) | -| org.springframework.retry | spring-retry | 1.1.2.RELEASE | [CQ10781](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10781) | -| org.springframework.security | spring-security-aspects | 4.1.4.RELEASE | [CQ12999](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12999) | -| org.springframework.security | spring-security-config | 4.1.4.RELEASE | [CQ13000](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13000) | -| org.springframework.security | spring-security-core | 4.1.4.RELEASE | [CQ13001](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13001) | -| org.springframework.security | spring-security-crypto | 4.1.4.RELEASE | [CQ](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13002) | -| org.springframework.security | spring-security-web | 4.1.4.RELEASE | [CQ13005](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13005) | -| org.springframework | spring-aop | 4.3.7.RELEASE | [CQ13003](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13003) | -| org.springframework | spring-aspects | 4.3.7.RELEASE | [CQ13006](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13006) | -| org.springframework | spring-beans | 4.3.7.RELEASE | [CQ13007](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13007) | -| org.springframework | spring-context-support | 4.3.7.RELEASE | [CQ13008](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13008) | -| org.springframework | spring-context | 4.3.7.RELEASE | [CQ13009](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13009) | -| org.springframework | spring-core | 4.3.7.RELEASE | [CQ13010](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13010) | -| org.springframework | spring-expression | 4.3.7.RELEASE | [CQ13011](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13011) | -| org.springframework | spring-jdbc | 4.3.7.RELEASE | [CQ13019](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13019) | -| org.springframework | spring-messaging | 4.3.7.RELEASE | [CQ13020](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13020) | -| org.springframework | spring-orm | 4.3.7.RELEASE | [CQ13021](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13021) | -| org.springframework | spring-tuple | 1.0.0.RELEASE | [CQ12998](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12998) | -| org.springframework | spring-tx | 4.3.7.RELEASE | [CQ13022](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13022) | -| org.springframework | spring-web | 4.3.7.RELEASE | [CQ13023](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13023) | -| org.springframework | spring-webmvc | 4.3.7.RELEASE | [CQ13024](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13024) | -| org.vaadin.addons.lazyquerycontainer | vaadin-lazyquerycontainer | 7.6.1.3 | [CQ13025](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13025) | -| org.vaadin.addons | flexibleoptiongroup | 2.2.0 | [CQ11050](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11050) | -| org.vaadin.addons | tokenfield | 7.0.1 | [CQ11051](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11051) | -| org.vaadin.alump.distributionbar | dbar-addon | 2.0.0 | [CQ13026](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13026) | -| org.vaadin.spring.addons | vaadin-spring-addon-eventbus | 0.0.6.RELEASE | [CQ11047](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11047) | -| org.vaadin.spring.extensions | vaadin-spring-ext-core | 0.0.6.RELEASE | [CQ11048](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11048) | -| org.vaadin.spring.extensions | vaadin-spring-ext-security | 0.0.6.RELEASE | [CQ11049](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11049) | -| org.w3c.css | sac | 1.3 | [CQ11052](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11052) | -| javax.servlet | javax.servlet-api | 3.1.0 | [CQ10362](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10362) | - -## Test and build dependencies - -Works with CQ: [CQ13040](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13040) - -| Group ID | Artifact ID | Version | -|---------------------------------|----------------------------------|---------------| -| asm | asm | 3.3.1 | -| cglib | cglib-nodep | 3.1 | -| com.google.gwt.gwtmockito | gwtmockito | 1.1.6 | -| com.google.gwt | gwt-dev | 2.7.0 | -| com.google.gwt | gwt-user | 2.7.0 | -| com.jayway.awaitility | awaitility | 1.7.0 | -| com.jayway.jsonpath | json-path | 2.0.0 | -| commons-beanutils | commons-beanutils-core | 1.8.3 | -| commons-logging | commons-logging | 1.1.1 | -| javax.el | javax.el-api | 2.2.4 | -| junit | junit | 4.12 | -| net._01001111 | jlorem | 1.1 | -| net.minidev | asm | 1.0.2 | -| net.minidev | json-smart | 2.1.1 | -| org.apache.tika | tika-core | 1.7 | -| org.aspectj | aspectjrt | 1.8.9 | -| org.assertj | assertj-core | 3.6.2 | -| org.atteo | evo-inflector | 1.2.1 | -| org.hamcrest | hamcrest-all | 1.3 | -| org.hamcrest | hamcrest-core | 1.3 | -| org.hamcrest | hamcrest-library | 1.3 | -| org.javassist | javassist | 3.20.0-GA | -| org.json | json | 20141113 | -| org.jvnet.jaxb2_commons | jaxb2-basics-runtime | 0.9.3 | -| org.mariadb.jdbc | mariadb-java-client | 1.5.7 | -| org.mockito | mockito-core | 1.10.19 | -| org.objenesis | objenesis | 2.1 | -| org.objenesis | objenesis | 2.5.1 | -| org.ow2.asm | asm-commons | 5.0.3 | -| org.ow2.asm | asm-tree | 5.0.3 | -| org.ow2.asm | asm-util | 5.0.3 | -| org.ow2.asm | asm | 5.0.3 | -| org.powermock | powermock-api-mockito-common | 1.6.5 | -| org.powermock | powermock-api-mockito | 1.6.5 | -| org.powermock | powermock-api-support | 1.6.5 | -| org.powermock | powermock-core | 1.6.5 | -| org.powermock | powermock-module-junit4-common | 1.6.5 | -| org.powermock | powermock-module-junit4 | 1.6.5 | -| org.powermock | powermock-reflect | 1.6.5 | -| org.skyscreamer | jsonassert | 1.3.0 | -| org.springframework.boot | spring-boot-starter-test | 1.4.5.RELEASE | -| org.springframework.boot | spring-boot-test-autoconfigure | 1.4.5.RELEASE | -| org.springframework.boot | spring-boot-test | 1.4.5.RELEASE | -| org.springframework.cloud | spring-cloud-stream-binder-test | 1.1.2.RELEASE | -| org.springframework.cloud | spring-cloud-stream-test-support | 1.1.2.RELEASE | -| org.springframework.data | spring-data-rest-core | 2.5.8.RELEASE | -| org.springframework.data | spring-data-rest-webmvc | 2.5.8.RELEASE | -| org.springframework.integration | spring-integration-test | 4.3.8.RELEASE | -| org.springframework | spring-test | 4.3.7.RELEASE | -| ru.yandex.qatools.allure | allure-java-adaptor-api | 1.4.22 | -| ru.yandex.qatools.allure | allure-java-annotations | 1.4.22 | -| ru.yandex.qatools.allure | allure-java-aspects | 1.4.22 | -| ru.yandex.qatools.allure | allure-junit-adaptor | 1.4.22 | -| ru.yandex.qatools.allure | allure-model | 1.4.22 | -| ru.yandex.qatools.properties | properties-loader | 1.5 | diff --git a/.3rd-party/0.3.0M6/Release_0_3_0M6.md b/.3rd-party/0.3.0M6/Release_0_3_0M6.md deleted file mode 100644 index 2495d9e9a2..0000000000 --- a/.3rd-party/0.3.0M6/Release_0_3_0M6.md +++ /dev/null @@ -1,211 +0,0 @@ -# 3rd party dependencies for Release 0.3.0 - -## Eclipse CQs - Provided/compile - -| Group ID | Artifact ID | Version | CQ | -|--------------------------------------|----------------------------------------|----------------|------------------------------------------------------------------| -| ch.qos.logback | logback-classic | 1.2.3 | [CQ17369](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17369) | -| ch.qos.logback | logback-core | 1.2.3 | [CQ17370](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17370) | -| com.cronutils | cron-utils | 5.0.5 | [CQ15762](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15762) | -| com.esotericsoftware | kryo-shaded | 3.0.3 | [CQ17372](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17372) | -| com.esotericsoftware | minlog | 1.3.0 | [CQ17371](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17371) | -| com.fasterxml | classmate | 1.3.4 | [CQ10239](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10239) | -| com.fasterxml.jackson.core | jackson-annotations | 2.9.0 | [CQ18146](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18146) | -| com.fasterxml.jackson.core | jackson-core | 2.9.7 | [CQ18147](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18147) | -| com.fasterxml.jackson.core | jackson-databind | 2.9.7 | [CQ18145](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18145) | -| com.fasterxml.jackson.dataformat | jackson-dataformat-cbor | 2.9.8 | [CQ18974](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18974) | -| com.github.ben-manes.caffeine | caffeine | 2.6.2 | [CQ17377](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17377) | -| com.github.gwtd3 | gwt-d3-api | 1.2.0 | [CQ13029](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13029) | -| com.github.gwtd3 | gwt-d3-js | 3.5.11 | [CQ13030](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13030) | -| com.github.stephenc.jcip | jcip-annotations | 1.0-1 | [CQ20513](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=20513) | -| com.google.guava | guava | 25.0-jre | [CQ16201](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16201) | -| com.h2database | h2 | 1.4.197 | [CQ10365](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10365) | -| com.microsoft.sqlserver | mssql-jdbc | 6.4.0 | [CQ15896](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15896) | -| com.nimbusds | oauth2-oidc-sdk | 6.0 | [CQ20510](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=20510) | -| com.nimbusds | lang-tag | 1.4.4 | [CQ20507](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=20507) | -| com.nimbusds | nimbus-jose-jwt | 7.5.1 | [CQ20509](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=20509) | -| commons-io | commons-io | 2.5 | [CQ17374](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17374) | -| com.rabbitmq | amqp-client | 5.4.3 | [CQ18173](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18173) | -| com.sun.mail | javax.mail | 1.6.2 | [CQ21444](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=21444) | -| com.vaadin.external.atmosphere | atmosphere-runtime | 2.2.9.vaadin2 | [CQ10714](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10714) | -| com.vaadin.external.flute | flute | 1.3.0.gg2 | [CQ11039](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11039) | -| com.vaadin.external.gwt | gwt-elemental | 2.7.0.vaadin4 | [CQ13031](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13031) | -| com.vaadin.external.gwt | gwt-user | 2.7.0.vaadin4 | [CQ13033](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13033) | -| com.vaadin.external.slf4j | vaadin-slf4j-jdk14 | 1.6.1 | [CQ10715](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10715) | -| com.vaadin | vaadin-client | 7.7.7 | [CQ12956](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12956) | -| com.vaadin | vaadin-push | 7.7.7 | [CQ12957](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12957) | -| com.vaadin | vaadin-sass-compiler | 0.9.12 | [CQ12958](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12958) | -| com.vaadin | vaadin-server | 7.7.7 | [CQ12959](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12959) | -| com.vaadin | vaadin-shared | 7.7.7 | [CQ12960](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12960) | -| com.vaadin | vaadin-spring-boot | 1.2.0 | [CQ18180](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18180) | -| com.vaadin | vaadin-spring | 1.2.0 | [CQ18181](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18181) | -| com.vaadin | vaadin-themes | 7.7.7 | [CQ12961](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12961) | -| com.zaxxer | HikariCP | 3.2.0 | [CQ18175](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18175) | -| cz.jirutka.rsql | rsql-parser | 2.1.0 | [CQ12964](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12964) | -| io.projectreactor | reactor-core | 3.2.2.RELEASE | [CQ18176](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18176) | -| io.protostuff | protostuff-api | 1.5.6 | [CQ12965](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12965) | -| io.protostuff | protostuff-collectionschema | 1.5.6 | [CQ12966](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12966) | -| io.protostuff | protostuff-core | 1.5.6 | [CQ12967](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12967) | -| io.protostuff | protostuff-runtime | 1.5.6 | [CQ12968](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12968) | -| javax.activation | activation | 1.1 | [CQ21445](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=21445) | -| javax.annotation | javax.annotation-api | 1.3.2 | [CQ17375](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17375) | -| javax.servlet | javax.servlet-api | 4.0.1 | [CQ18011](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18011) | -| javax.transaction | javax.transaction-api | 1.3 | [CQ18178](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18178) | -| javax.validation | validation-api | 2.0.1.Final | [CQ18177](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18177) | -| javax.websocket | javax.websocket-api | 1.1 | [CQ16449](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=16449) | -| net.minidev | accessors-smart | 1.2 | [CQ20512](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=20512) | -| net.minidev | json-smart | 2.3 | [CQ20511](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=20511) | -| org.apache.commons | commons-lang3 | 3.7 | [CQ18140](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18140) | -| org.flywaydb | flyway-core | 5.2.1 | [CQ18182](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18182) | -| org.glassfish | javax.json | 1.0.4 | [CQ10619](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10619) | -| org.hibernate.validator | hibernate-validator | 6.0.13.Final | [CQ15540](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=15540) | -| org.jboss.logging | jboss-logging | 3.3.2.Final | [CQ10621](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=10621) | -| org.jsoup | jsoup | 1.8.3 | [CQ12936](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12936) | -| org.mortbay.jasper | apache-el | 8.5.33 | [CQ18233](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18233) | -| org.ow2.asm | asm-analysis | 6.2 | [CQ18183](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18183) | -| org.ow2.asm | asm-commons | 6.2 | [CQ18183](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18183) | -| org.ow2.asm | asm | 6.2 | [CQ18183](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18183) | -| org.ow2.asm | asm-tree | 6.2 | [CQ18183](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18183) | -| org.postgresql | postgresql | 42.2.5 | CQ17092 Piggybacked | -| org.reactivestreams | reactive-streams | 1.0.2 | [CQ18184](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18184) | -| org.slf4j | jul-to-slf4j | 1.7.25 | [CQ12937](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12937) | -| org.slf4j | slf4j-api | 1.7.25 | [CQ12940](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12940) | -| org.springframework.amqp | spring-amqp | 2.1.0.RELEASE | [CQ18141](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18141) | -| org.springframework.amqp | spring-rabbit | 2.1.0.RELEASE | [CQ18142](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18142) | -| org.springframework.boot | spring-boot-autoconfigure | 2.1.0.RELEASE | [CQ18143](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18143) | -| org.springframework.boot | spring-boot | 2.1.0.RELEASE | [CQ18192](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18192) | -| org.springframework.boot | spring-boot-starter-aop | 2.1.0.RELEASE | [CQ18198](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18198) | -| org.springframework.boot | spring-boot-starter-data-jpa | 2.1.0.RELEASE | [CQ18200](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18200) | -| org.springframework.boot | spring-boot-starter | 2.1.0.RELEASE | [CQ18204](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18204) | -| org.springframework.boot | spring-boot-starter-jdbc | 2.1.0.RELEASE | [CQ18205](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18205) | -| org.springframework.boot | spring-boot-starter-jetty | 2.1.0.RELEASE | [CQ18206](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18206) | -| org.springframework.boot | spring-boot-starter-json | 2.1.0.RELEASE | [CQ18209](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18209) | -| org.springframework.boot | spring-boot-starter-logging | 2.1.0.RELEASE | [CQ18210](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18210) | -| org.springframework.boot | spring-boot-starter-validation | 2.1.0.RELEASE | [CQ18211](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18211) | -| org.springframework.boot | spring-boot-starter-web | 2.1.0.RELEASE | [CQ18212](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18212) | -| org.springframework.cloud | spring-cloud-bus | 2.1.0.RELEASE | [CQ18799](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18799) | -| org.springframework.cloud | spring-cloud-commons | 2.1.0.RELEASE | [CQ18800](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18800) | -| org.springframework.cloud | spring-cloud-context | 2.1.0.RELEASE | [CQ18801](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18801) | -| org.springframework.cloud | spring-cloud-stream | 2.1.0.RELEASE | [CQ18802](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18802) | -| org.springframework.data | spring-data-commons | 2.1.2.RELEASE | [CQ18213](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18213) | -| org.springframework.data | spring-data-jpa | 2.1.2.RELEASE | [CQ18214](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18214) | -| org.springframework.hateoas | spring-hateoas | 0.25.0.RELEASE | [CQ18228](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18228) | -| org.springframework.integration | spring-integration-core | 5.1.0.RELEASE | [CQ18229](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18229) | -| org.springframework.integration | spring-integration-jmx | 5.1.0.RELEASE | [CQ18230](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18230) | -| org.springframework.integration | spring-integration-tuple | 1.0.0.RELEASE | [CQ12996](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12996) | -| org.springframework.plugin | spring-plugin-core | 1.2.0.RELEASE | [CQ12997](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12997) | -| org.springframework.retry | spring-retry | 1.2.2.RELEASE | [CQ18231](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18231) | -| org.springframework.security | spring-security-aspects | 5.1.1.RELEASE | [CQ18350](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18350) | -| org.springframework.security | spring-security-config | 5.1.1.RELEASE | [CQ18351](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18351) | -| org.springframework.security | spring-security-core | 5.1.1.RELEASE | [CQ18352](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18352) | -| org.springframework.security | spring-security-crypto | 5.1.1.RELEASE | [CQ18353](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18353) | -| org.springframework.security | spring-security-oauth2-client | 5.1.5.RELEASE | [CQ20474](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=20474) | -| org.springframework.security | spring-security-oauth2-core | 5.1.5.RELEASE | [CQ20475](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=20475) | -| org.springframework.security | spring-security-oauth2-jose | 5.1.5.RELEASE | [CQ20476](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=20476) | -| org.springframework.security | spring-security-oauth2-resource-server | 5.1.5.RELEASE | [CQ21429](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=21429) | -| org.springframework.security | spring-security-web | 5.1.1.RELEASE | [CQ18354](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18354) | -| org.springframework | spring-aop | 5.1.2.RELEASE | [CQ18355](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18355) | -| org.springframework | spring-aspects | 5.1.2.RELEASE | [CQ18356](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18356) | -| org.springframework | spring-beans | 5.1.2.RELEASE | [CQ18357](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18357) | -| org.springframework | spring-context | 5.1.2.RELEASE | [CQ18358](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18358) | -| org.springframework | spring-context-support | 5.1.2.RELEASE | [CQ18359](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18359) | -| org.springframework | spring-core | 5.1.2.RELEASE | [CQ18360](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18360) | -| org.springframework | spring-expression | 5.1.2.RELEASE | [CQ18361](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18361) | -| org.springframework | spring-jcl | 5.1.2.RELEASE | [CQ18362](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18362) | -| org.springframework | spring-jdbc | 5.1.2.RELEASE | [CQ18363](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18363) | -| org.springframework | spring-messaging | 5.1.2.RELEASE | [CQ18364](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18364) | -| org.springframework | spring-orm | 5.1.2.RELEASE | [CQ18365](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18365) | -| org.springframework | spring-tuple | 1.0.0.RELEASE | [CQ12998](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=12998) | -| org.springframework | spring-tx | 5.1.2.RELEASE | [CQ18366](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18366) | -| org.springframework | spring-web | 5.1.2.RELEASE | [CQ18367](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18367) | -| org.springframework | spring-webmvc | 5.1.2.RELEASE | [CQ18368](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18368) | -| org.vaadin.addons.lazyquerycontainer | vaadin-lazyquerycontainer | 7.6.1.3 | [CQ13025](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13025) | -| org.vaadin.addons | flexibleoptiongroup | 2.2.0 | [CQ11050](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11050) | -| org.vaadin.alump.distributionbar | dbar-addon | 2.0.0 | [CQ13026](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=13026) | -| org.vaadin.spring.addons | vaadin-spring-addon-eventbus | 0.0.6.RELEASE | [CQ11047](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11047) | -| org.vaadin.spring.extensions | vaadin-spring-ext-core | 0.0.6.RELEASE | [CQ11048](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11048) | -| org.vaadin.spring.extensions | vaadin-spring-ext-security | 0.0.6.RELEASE | [CQ11049](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11049) | -| org.w3c.css | sac | 1.3 | [CQ11052](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=11052) | - -## Test and build dependencies - -CQ: [CQ18804](https://dev.eclipse.org/ipzilla/show_bug.cgi?id=18804) - -| Group ID | Artifact ID | Version | -|---------------------------------|----------------------------------|----------------------| -| ant | ant | 1.6.5 | -| colt | colt | 1.2.0 | -| com.fasterxml.jackson.module | jackson-module-jaxb-annotations | 2.9.8 | -| com.google.code.gson | gson | 2.8.5 | -| com.google.gwt.gwtmockito | gwtmockito | 1.1.8 | -| com.google.gwt | gwt-dev | 2.8.0 | -| com.google.gwt | gwt-user | 2.8.0 | -| com.google.jsinterop | jsinterop-annotations | 1.0.1 | -| com.google.jsinterop | jsinterop-annotations | sources | -| com.ibm.icu | icu4j | 50.1.1 | -| com.jayway.jsonpath | json-path | 2.4.0 | -| com.rabbitmq | http-client | 2.1.0.RELEASE | -| com.vaadin.external.google | android-json | 0.0.20131108.vaadin1 | -| commons-codec | commons-codec | 1.11 | -| commons-collections | commons-collections | 3.2.2 | -| commons-net | commons-net | 3.6 | -| io.qameta.allure | allure-java-commons | 2.7.0 | -| io.qameta.allure | allure-junit4 | 2.7.0 | -| io.qameta.allure | allure2-model-api | 1.0.0 | -| io.qameta.allure | allure2-model-jackson | 1.0.0 | -| io.qameta.allure | allure2-model-pojo | 1.0.0 | -| javax.el | javax.el-api | 2.2.4 | -| junit | junit | 4.12 | -| net.\_01001111 | jlorem | 1.1 | -| net.bytebuddy | byte-buddy-agent | 1.9.7 | -| net.bytebuddy | byte-buddy | 1.9.7 | -| net.minidev | accessors-smart | 1.2 | -| net.minidev | json-smart | 2.3 | -| net.sourceforge.htmlunit | htmlunit-core-js | 2.33 | -| net.sourceforge.htmlunit | htmlunit-cssparser | 1.2.0 | -| net.sourceforge.htmlunit | htmlunit | 2.33 | -| net.sourceforge.htmlunit | neko-htmlunit | 2.33 | -| org.apache.commons | commons-text | 1.4 | -| org.apache.httpcomponents | httpclient | 4.5.6 | -| org.apache.httpcomponents | httpcore | 4.4.10 | -| org.apache.httpcomponents | httpmime | 4.5.6 | -| org.apache.tika | tika-core | 1.14 | -| org.apache.tomcat.embed | tomcat-embed-el | 9.0.14 | -| org.aspectj | aspectjrt | 1.9.2 | -| org.aspectj | aspectjweaver | 1.9.2 | -| org.assertj | assertj-core | 3.11.1 | -| org.awaitility | awaitility | 3.1.2 | -| org.hamcrest | hamcrest-all | 1.3 | -| org.hamcrest | hamcrest-core | 1.3 | -| org.hamcrest | hamcrest-library | 1.3 | -| org.javassist | javassist | 3.22.0-GA | -| org.jooq | joor-java-8 | 0.9.9 | -| org.mariadb.jdbc | mariadb-java-client | 2.3.0 | -| org.mockito | mockito-core | 2.23.4 | -| org.mortbay.jasper | apache-jsp | 8.5.33.1 | -| org.objenesis | objenesis | 2.6 | -| org.ow2.asm | asm-commons | 5.0.3 | -| org.ow2.asm | asm-tree | 5.0.3 | -| org.ow2.asm | asm-util | 5.0.3 | -| org.ow2.asm | asm | 5.0.3 | -| org.ow2.asm | asm | 5.0.4 | -| org.skyscreamer | jsonassert | 1.5.0 | -| org.springframework.amqp | spring-rabbit-junit | 2.1.3.RELEASE | -| org.springframework.amqp | spring-rabbit-test | 2.1.3.RELEASE | -| org.springframework.boot | spring-boot-starter-test | 2.1.2.RELEASE | -| org.springframework.boot | spring-boot-test-autoconfigure | 2.1.2.RELEASE | -| org.springframework.boot | spring-boot-test | 2.1.2.RELEASE | -| org.springframework.cloud | spring-cloud-stream-binder-test | 2.1.0.RELEASE | -| org.springframework.cloud | spring-cloud-stream-test-support | 2.1.0.RELEASE | -| org.springframework.integration | spring-integration-test-support | 5.1.2.RELEASE | -| org.springframework.integration | spring-integration-test | 5.1.2.RELEASE | -| org.springframework.restdocs | spring-restdocs-core | 2.0.3.RELEASE | -| org.springframework.restdocs | spring-restdocs-mockmvc | 2.0.3.RELEASE | -| org.springframework | spring-test | 5.1.4.RELEASE | -| org.xmlunit | xmlunit-core | 2.6.2 | -| org.yaml | snakeyaml | 1.23 | -| tapestry | tapestry | 4.0.2 | -| xalan | serializer | 2.7.2 | -| xalan | xalan | 2.7.2 | -| xerces | xercesImpl | 2.12.0 | -| xml-apis | xml-apis | 1.4.01 | diff --git a/.3rd-party/0.3.0M6/compile.txt b/.3rd-party/0.3.0M6/compile.txt deleted file mode 100644 index a6fba831cb..0000000000 --- a/.3rd-party/0.3.0M6/compile.txt +++ /dev/null @@ -1,132 +0,0 @@ -ch.qos.logback:logback-classic:jar:1.2.3:compile -ch.qos.logback:logback-core:jar:1.2.3:compile -com.cronutils:cron-utils:jar:5.0.5:compile -com.esotericsoftware:kryo-shaded:jar:3.0.3:compile -com.esotericsoftware:minlog:jar:1.3.0:compile -com.fasterxml.jackson.core:jackson-annotations:jar:2.9.0:compile -com.fasterxml.jackson.core:jackson-core:jar:2.9.8:compile -com.fasterxml.jackson.core:jackson-databind:jar:2.9.8:compile -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar:2.9.8:compile -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar:2.9.8:compile -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.9.8:compile -com.fasterxml.jackson.module:jackson-module-parameter-names:jar:2.9.8:compile -com.fasterxml:classmate:jar:1.3.4:compile -com.github.ben-manes.caffeine:caffeine:jar:2.6.2:compile -com.github.gwtd3:gwt-d3-api:jar:1.2.0:compile -com.github.gwtd3:gwt-d3-js:jar:3.5.11:compile -com.github.gwtd3:gwt-d3-js:jar:sources:3.5.11:compile -com.github.stephenc.jcip:jcip-annotations:jar:1.0-1:compile -com.google.guava:guava:jar:25.0-jre:compile -com.h2database:h2:jar:1.4.199:compile -com.microsoft.sqlserver:mssql-jdbc:jar:6.4.0.jre8:compile -com.nimbusds:lang-tag:jar:1.4.4:compile -com.nimbusds:nimbus-jose-jwt:jar:6.0.2:compile -com.nimbusds:oauth2-oidc-sdk:jar:6.0:compile -com.rabbitmq:amqp-client:jar:5.4.3:compile -com.sun.mail:javax.mail:jar:1.6.2:compile -com.vaadin.external.atmosphere:atmosphere-runtime:jar:2.2.9.vaadin2:compile -com.vaadin.external.flute:flute:jar:1.3.0.gg2:compile -com.vaadin.external.gwt:gwt-elemental:jar:2.7.0.vaadin6:compile -com.vaadin.external.gwt:gwt-user:jar:2.7.0.vaadin6:compile -com.vaadin.external.slf4j:vaadin-slf4j-jdk14:jar:1.6.1:compile -com.vaadin:vaadin-client:jar:7.7.13:compile -com.vaadin:vaadin-push:jar:7.7.13:compile -com.vaadin:vaadin-sass-compiler:jar:0.9.13:compile -com.vaadin:vaadin-server:jar:7.7.13:compile -com.vaadin:vaadin-shared:jar:7.7.13:compile -com.vaadin:vaadin-spring-boot:jar:1.2.0:compile -com.vaadin:vaadin-spring:jar:1.2.0:compile -com.vaadin:vaadin-themes:jar:7.7.13:compile -com.zaxxer:HikariCP:jar:3.2.0:compile -commons-io:commons-io:jar:2.5:compile -cz.jirutka.rsql:rsql-parser:jar:2.1.0:compile -io.projectreactor:reactor-core:jar:3.2.8.RELEASE:compile -io.protostuff:protostuff-api:jar:1.5.6:compile -io.protostuff:protostuff-collectionschema:jar:1.5.6:compile -io.protostuff:protostuff-core:jar:1.5.6:compile -io.protostuff:protostuff-runtime:jar:1.5.6:compile -javax.activation:activation:jar:1.1:compile -javax.annotation:javax.annotation-api:jar:1.3.2:compile -javax.json:javax.json-api:jar:1.1.4:compile -javax.servlet:javax.servlet-api:jar:4.0.1:compile -javax.transaction:javax.transaction-api:jar:1.3:compile -javax.validation:validation-api:jar:2.0.1.Final:compile -javax.validation:validation-api:jar:sources:1.0.0.GA:compile -javax.websocket:javax.websocket-api:jar:1.1:compile -net.minidev:accessors-smart:jar:1.2:compile -net.minidev:json-smart:jar:2.3:compile -org.apache.commons:commons-lang3:jar:3.7:compile -org.apache.logging.log4j:log4j-api:jar:2.11.2:compile -org.apache.logging.log4j:log4j-to-slf4j:jar:2.11.2:compile -org.flywaydb:flyway-core:jar:5.2.4:compile -org.hibernate.validator:hibernate-validator:jar:6.0.16.Final:compile -org.jboss.logging:jboss-logging:jar:3.3.2.Final:compile -org.jsoup:jsoup:jar:1.8.3:compile -org.mortbay.jasper:apache-el:jar:8.5.35.1:compile -org.ow2.asm:asm-analysis:jar:7.0:compile -org.ow2.asm:asm-commons:jar:7.0:compile -org.ow2.asm:asm-tree:jar:7.0:compile -org.ow2.asm:asm:jar:7.0:compile -org.postgresql:postgresql:jar:42.2.5:compile -org.reactivestreams:reactive-streams:jar:1.0.2:compile -org.slf4j:jul-to-slf4j:jar:1.7.26:compile -org.slf4j:slf4j-api:jar:1.7.26:compile -org.springframework.amqp:spring-amqp:jar:2.1.5.RELEASE:compile -org.springframework.amqp:spring-rabbit:jar:2.1.5.RELEASE:compile -org.springframework.boot:spring-boot-autoconfigure:jar:2.1.4.RELEASE:compile -org.springframework.boot:spring-boot-starter-aop:jar:2.1.4.RELEASE:compile -org.springframework.boot:spring-boot-starter-data-jpa:jar:2.1.4.RELEASE:compile -org.springframework.boot:spring-boot-starter-jdbc:jar:2.1.4.RELEASE:compile -org.springframework.boot:spring-boot-starter-jetty:jar:2.1.4.RELEASE:compile -org.springframework.boot:spring-boot-starter-json:jar:2.1.4.RELEASE:compile -org.springframework.boot:spring-boot-starter-logging:jar:2.1.4.RELEASE:compile -org.springframework.boot:spring-boot-starter-oauth2-client:jar:2.1.4.RELEASE:compile -org.springframework.boot:spring-boot-starter-oauth2-resource-server:jar:2.1.4.RELEASE:compile -org.springframework.boot:spring-boot-starter-validation:jar:2.1.4.RELEASE:compile -org.springframework.boot:spring-boot-starter-web:jar:2.1.4.RELEASE:compile -org.springframework.boot:spring-boot-starter:jar:2.1.4.RELEASE:compile -org.springframework.boot:spring-boot:jar:2.1.4.RELEASE:compile -org.springframework.cloud:spring-cloud-bus:jar:2.1.0.RELEASE:compile -org.springframework.cloud:spring-cloud-commons:jar:2.1.0.RELEASE:compile -org.springframework.cloud:spring-cloud-context:jar:2.1.0.RELEASE:compile -org.springframework.cloud:spring-cloud-starter:jar:2.1.0.RELEASE:compile -org.springframework.cloud:spring-cloud-stream:jar:2.1.0.RELEASE:compile -org.springframework.data:spring-data-commons:jar:2.1.6.RELEASE:compile -org.springframework.data:spring-data-jpa:jar:2.1.6.RELEASE:compile -org.springframework.hateoas:spring-hateoas:jar:0.25.1.RELEASE:compile -org.springframework.integration:spring-integration-core:jar:5.1.4.RELEASE:compile -org.springframework.integration:spring-integration-jmx:jar:5.1.4.RELEASE:compile -org.springframework.integration:spring-integration-tuple:jar:1.0.0.RELEASE:compile -org.springframework.plugin:spring-plugin-core:jar:1.2.0.RELEASE:compile -org.springframework.retry:spring-retry:jar:1.2.4.RELEASE:compile -org.springframework.security:spring-security-aspects:jar:5.1.5.RELEASE:compile -org.springframework.security:spring-security-config:jar:5.1.5.RELEASE:compile -org.springframework.security:spring-security-core:jar:5.1.5.RELEASE:compile -org.springframework.security:spring-security-crypto:jar:5.1.5.RELEASE:compile -org.springframework.security:spring-security-oauth2-client:jar:5.1.5.RELEASE:compile -org.springframework.security:spring-security-oauth2-core:jar:5.1.5.RELEASE:compile -org.springframework.security:spring-security-oauth2-jose:jar:5.1.5.RELEASE:compile -org.springframework.security:spring-security-oauth2-resource-server:jar:5.1.5.RELEASE:compile -org.springframework.security:spring-security-web:jar:5.1.5.RELEASE:compile -org.springframework:spring-aop:jar:5.1.6.RELEASE:compile -org.springframework:spring-aspects:jar:5.1.6.RELEASE:compile -org.springframework:spring-beans:jar:5.1.6.RELEASE:compile -org.springframework:spring-context-support:jar:5.1.6.RELEASE:compile -org.springframework:spring-context:jar:5.1.6.RELEASE:compile -org.springframework:spring-core:jar:5.1.6.RELEASE:compile -org.springframework:spring-expression:jar:5.1.6.RELEASE:compile -org.springframework:spring-jcl:jar:5.1.6.RELEASE:compile -org.springframework:spring-jdbc:jar:5.1.6.RELEASE:compile -org.springframework:spring-messaging:jar:5.1.6.RELEASE:compile -org.springframework:spring-orm:jar:5.1.6.RELEASE:compile -org.springframework:spring-tuple:jar:1.0.0.RELEASE:compile -org.springframework:spring-tx:jar:5.1.6.RELEASE:compile -org.springframework:spring-web:jar:5.1.6.RELEASE:compile -org.springframework:spring-webmvc:jar:5.1.6.RELEASE:compile -org.vaadin.addons.lazyquerycontainer:vaadin-lazyquerycontainer:jar:7.6.1.3:compile -org.vaadin.addons:flexibleoptiongroup:jar:2.2.0:compile -org.vaadin.alump.distributionbar:dbar-addon:jar:2.0.0:compile -org.vaadin.spring.addons:vaadin-spring-addon-eventbus:jar:0.0.6.RELEASE:compile -org.vaadin.spring.extensions:vaadin-spring-ext-core:jar:0.0.6.RELEASE:compile -org.vaadin.spring.extensions:vaadin-spring-ext-security:jar:0.0.6.RELEASE:compile -org.w3c.css:sac:jar:1.3:compile diff --git a/.3rd-party/0.3.0M6/generateReleaseMd.sh b/.3rd-party/0.3.0M6/generateReleaseMd.sh deleted file mode 100644 index bf42df71b0..0000000000 --- a/.3rd-party/0.3.0M6/generateReleaseMd.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -echo "# 3rd party dependencies for Release X.X.X" -echo "" -echo "## Eclipse CQs - Provided/compile" -echo "" -echo "| Group ID | Artifact ID | Version | CQ |" -echo "|---|---|---|---|---|" -cat compile.txt provided.txt|cut -d':' -f1,2,4|sed -e 's/:/|/g'|while read i; do echo "|$i| []() |";done -echo "" -echo "## Test and build dependencies" -echo "" -echo "CQ: " -echo "" -echo "| Group ID | Artifact ID | Version |" -echo "|---|---|---|" -cut -d':' -f1,2,4 test.txt|sed -e 's/:/|/g'|while read i; do echo "|$i|";done diff --git a/.3rd-party/0.3.0M6/listDeps.sh b/.3rd-party/0.3.0M6/listDeps.sh deleted file mode 100755 index 1e3383361b..0000000000 --- a/.3rd-party/0.3.0M6/listDeps.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -cd .. - -# Provided and compile (excludes the test modules) -mvn dependency:list -B -DexcludeGroupIds=org.eclipse,org.aspectj -pl '!org.eclipse.hawkbit:hawkbit-repository-test,!org.eclipse.hawkbit:hawkbit-dmf-rabbitmq-test' -Dsort=true -DoutputFile=dependencies.txt -find . -name dependencies.txt|while read i; do cat $i;done|grep '.*:.*:compile'| tr -d '[:blank:]'| sed -e 's/(optional)//'|sort|uniq > .3rd-party/compile.txt -find . -name dependencies.txt|while read i; do cat $i;done|grep '.*:.*:provided'| tr -d '[:blank:]'| sed -e 's/(optional)//'|sort|uniq > .3rd-party/provided.txt - -# Test dependencies -mvn dependency:list -B -DexcludeGroupIds=org.eclipse -Dsort=true -DoutputFile=dependencies.txt -find . -name dependencies.txt|while read i; do cat $i;done|grep '.*:.*:test'| tr -d '[:blank:]'| sed -e 's/(optional)//'|sort|uniq > .3rd-party/test.txt - -# Cleanup temp files -find . -name dependencies.txt|while read i; do rm $i;done - -# Sort and order content -cd .3rd-party/ -cat compile.txt provided.txt|cut -d':' -f1-4|while read i; do grep -h $i test.txt;done|sort|uniq|while read x; do sed -i.bak -e s/$x// test.txt ;done -sed -i.bak '/^[[:space:]]*$/d' test.txt -rm *.bak diff --git a/.3rd-party/0.3.0M6/provided.txt b/.3rd-party/0.3.0M6/provided.txt deleted file mode 100644 index b45d413af2..0000000000 --- a/.3rd-party/0.3.0M6/provided.txt +++ /dev/null @@ -1 +0,0 @@ -javax.servlet:javax.servlet-api:jar:4.0.1:provided diff --git a/.3rd-party/0.3.0M6/test.txt b/.3rd-party/0.3.0M6/test.txt deleted file mode 100644 index 9971a5410b..0000000000 --- a/.3rd-party/0.3.0M6/test.txt +++ /dev/null @@ -1,78 +0,0 @@ -ant:ant:jar:1.6.5:test -colt:colt:jar:1.2.0:test -com.fasterxml.jackson.module:jackson-module-jaxb-annotations:jar:2.9.8:test -com.google.code.gson:gson:jar:2.8.5:test -com.google.gwt.gwtmockito:gwtmockito:jar:1.1.8:test -com.google.gwt:gwt-dev:jar:2.8.0:test -com.google.gwt:gwt-user:jar:2.8.0:test -com.google.jsinterop:jsinterop-annotations:jar:1.0.1:test -com.google.jsinterop:jsinterop-annotations:jar:sources:1.0.1:test -com.ibm.icu:icu4j:jar:50.1.1:test -com.jayway.jsonpath:json-path:jar:2.4.0:test -com.rabbitmq:http-client:jar:2.1.0.RELEASE:test -com.vaadin.external.google:android-json:jar:0.0.20131108.vaadin1:test -commons-codec:commons-codec:jar:1.11:test -commons-collections:commons-collections:jar:3.2.2:test -commons-net:commons-net:jar:3.6:test -io.qameta.allure:allure-java-commons:jar:2.7.0:test -io.qameta.allure:allure-junit4:jar:2.7.0:test -io.qameta.allure:allure2-model-api:jar:1.0.0:test -io.qameta.allure:allure2-model-jackson:jar:1.0.0:test -io.qameta.allure:allure2-model-pojo:jar:1.0.0:test -javax.el:javax.el-api:jar:2.2.4:test -junit:junit:jar:4.12:test -net._01001111:jlorem:jar:1.1:test -net.bytebuddy:byte-buddy-agent:jar:1.9.12:test -net.bytebuddy:byte-buddy:jar:1.9.12:test -net.minidev:accessors-smart:jar:1.2:test -net.minidev:json-smart:jar:2.3:test -net.sourceforge.htmlunit:htmlunit-core-js:jar:2.33:test -net.sourceforge.htmlunit:htmlunit-cssparser:jar:1.2.0:test -net.sourceforge.htmlunit:htmlunit:jar:2.33:test -net.sourceforge.htmlunit:neko-htmlunit:jar:2.33:test -org.apache.commons:commons-text:jar:1.4:test -org.apache.httpcomponents:httpclient:jar:4.5.6:test -org.apache.httpcomponents:httpcore:jar:4.4.11:test -org.apache.httpcomponents:httpmime:jar:4.5.6:test -org.apache.tika:tika-core:jar:1.14:test -org.apache.tomcat.embed:tomcat-embed-el:jar:9.0.17:test -org.aspectj:aspectjrt:jar:1.9.2:test -org.aspectj:aspectjweaver:jar:1.9.2:test -org.assertj:assertj-core:jar:3.11.1:test -org.awaitility:awaitility:jar:3.1.2:test -org.hamcrest:hamcrest-all:jar:1.3:test -org.hamcrest:hamcrest-core:jar:1.3:test -org.hamcrest:hamcrest-library:jar:1.3:test -org.javassist:javassist:jar:3.22.0-GA:test -org.jooq:joor-java-8:jar:0.9.9:test -org.mariadb.jdbc:mariadb-java-client:jar:2.3.0:test -org.mockito:mockito-core:jar:2.23.4:test -org.mortbay.jasper:apache-jsp:jar:8.5.35.1:test -org.objenesis:objenesis:jar:2.6:test -org.ow2.asm:asm-commons:jar:5.0.3:test -org.ow2.asm:asm-tree:jar:5.0.3:test -org.ow2.asm:asm-util:jar:5.0.3:test -org.ow2.asm:asm:jar:5.0.3:test -org.ow2.asm:asm:jar:5.0.4:test -org.skyscreamer:jsonassert:jar:1.5.0:test -org.springframework.amqp:spring-rabbit-junit:jar:2.1.5.RELEASE:test -org.springframework.amqp:spring-rabbit-test:jar:2.1.5.RELEASE:test -org.springframework.boot:spring-boot-starter-test:jar:2.1.4.RELEASE:test -org.springframework.boot:spring-boot-test-autoconfigure:jar:2.1.4.RELEASE:test -org.springframework.boot:spring-boot-test:jar:2.1.4.RELEASE:test -org.springframework.cloud:spring-cloud-function-context:jar:2.0.0.RELEASE:test -org.springframework.cloud:spring-cloud-function-core:jar:2.0.0.RELEASE:test -org.springframework.cloud:spring-cloud-stream-binder-test:jar:2.1.0.RELEASE:test -org.springframework.cloud:spring-cloud-stream-test-support:jar:2.1.0.RELEASE:test -org.springframework.integration:spring-integration-test-support:jar:5.1.4.RELEASE:test -org.springframework.integration:spring-integration-test:jar:5.1.4.RELEASE:test -org.springframework.restdocs:spring-restdocs-core:jar:2.0.3.RELEASE:test -org.springframework.restdocs:spring-restdocs-mockmvc:jar:2.0.3.RELEASE:test -org.springframework:spring-test:jar:5.1.6.RELEASE:test -org.xmlunit:xmlunit-core:jar:2.6.2:test -org.yaml:snakeyaml:jar:1.23:test -tapestry:tapestry:jar:4.0.2:test -xalan:serializer:jar:2.7.2:test -xalan:xalan:jar:2.7.2:test -xerces:xercesImpl:jar:2.12.0:test -xml-apis:xml-apis:jar:1.4.01:test diff --git a/.3rd-party/DEPENDENCIES b/.3rd-party/DEPENDENCIES index c0099aeb41..6ef9eea666 100644 --- a/.3rd-party/DEPENDENCIES +++ b/.3rd-party/DEPENDENCIES @@ -5,6 +5,7 @@ maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.5, Apache maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.5, Apache-2.0, approved, #2133 maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.5, Apache-2.0, approved, #2134 maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-cbor/2.13.5, Apache-2.0, approved, clearlydefined +maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.13.5, Apache-2.0, approved, #2566 maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.13.5, Apache-2.0, approved, clearlydefined maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.5, Apache-2.0, approved, clearlydefined maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.13.5, Apache-2.0, approved, clearlydefined @@ -15,12 +16,12 @@ maven/mavencentral/com.github.gwtd3/gwt-d3-js/3.5.11, Apache-2.0, approved, CQ13 maven/mavencentral/com.github.stephenc.jcip/jcip-annotations/1.0-1, Apache-2.0, approved, CQ21949 maven/mavencentral/com.google.errorprone/error_prone_annotations/2.10.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.google.guava/failureaccess/1.0.1, Apache-2.0, approved, CQ22654 -maven/mavencentral/com.google.guava/guava/32.1.1-jre, Apache-2.0 AND CC0-1.0 AND LicenseRef-Public-Domain, approved, #9229 +maven/mavencentral/com.google.guava/guava/32.1.2-jre, Apache-2.0 AND CC0-1.0 AND LicenseRef-Public-Domain, approved, #9229 maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657 maven/mavencentral/com.google.gwt/gwt-elemental/2.8.2, Apache-2.0, approved, CQ14599 maven/mavencentral/com.google.gwt/gwt-user/2.9.0, Apache-2.0 AND CC0-1.0, approved, #7408 maven/mavencentral/com.google.jsinterop/jsinterop-annotations/2.0.0, Apache-2.0, approved, clearlydefined -maven/mavencentral/com.h2database/h2/2.2.220, (EPL-1.0 OR MPL-2.0) AND (LGPL-3.0-or-later OR EPL-1.0 OR MPL-2.0), approved, #9322 +maven/mavencentral/com.h2database/h2/2.2.222, (EPL-1.0 OR MPL-2.0) AND (LGPL-3.0-or-later OR EPL-1.0 OR MPL-2.0), approved, #9322 maven/mavencentral/com.jayway.jsonpath/json-path/2.7.0, Apache-2.0, approved, clearlydefined maven/mavencentral/com.microsoft.sqlserver/mssql-jdbc/10.2.3.jre8, MIT, approved, clearlydefined maven/mavencentral/com.nimbusds/content-type/2.2, Apache-2.0, approved, clearlydefined @@ -44,15 +45,20 @@ maven/mavencentral/com.vaadin/vaadin-themes/8.14.3, Apache-2.0, approved, #7770 maven/mavencentral/com.zaxxer/HikariCP/4.0.3, Apache-2.0, approved, clearlydefined maven/mavencentral/commons-io/commons-io/2.13.0, Apache-2.0, approved, #8717 maven/mavencentral/cz.jirutka.rsql/rsql-parser/2.1.0, MIT, approved, CQ12964 -maven/mavencentral/io.projectreactor/reactor-core/3.4.31, Apache-2.0, approved, #7517 +maven/mavencentral/io.projectreactor/reactor-core/3.4.33, Apache-2.0, approved, #7517 maven/mavencentral/io.protostuff/protostuff-api/1.8.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.protostuff/protostuff-collectionschema/1.8.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.protostuff/protostuff-core/1.8.0, Apache-2.0, approved, clearlydefined maven/mavencentral/io.protostuff/protostuff-runtime/1.8.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.9, Apache-2.0, approved, #11362 +maven/mavencentral/io.swagger.core.v3/swagger-core/2.2.9, Apache-2.0, approved, #9265 +maven/mavencentral/io.swagger.core.v3/swagger-models/2.2.9, Apache-2.0, approved, #10353 +maven/mavencentral/jakarta.activation/jakarta.activation-api/1.2.2, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf maven/mavencentral/jakarta.annotation/jakarta.annotation-api/1.3.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca maven/mavencentral/jakarta.persistence/jakarta.persistence-api/2.2.3, EPL-2.0 OR BSD-3-Clause, approved, clearlydefined maven/mavencentral/jakarta.transaction/jakarta.transaction-api/1.3.3, EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0, approved, #7701 -maven/mavencentral/jakarta.validation/jakarta.validation-api/2.0.2, Apache-2.0, approved, clearlydefined +maven/mavencentral/jakarta.validation/jakarta.validation-api/2.0.2, Apache-2.0, approved, ee4j.validation +maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/2.3.3, BSD-3-Clause, approved, ee4j.jaxb maven/mavencentral/javax.activation/javax.activation-api/1.2.0, (CDDL-1.1 OR GPL-2.0 WITH Classpath-exception-2.0) AND Apache-2.0, approved, CQ18740 maven/mavencentral/javax.servlet/javax.servlet-api/4.0.1, (CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0) AND Apache-2.0, approved, CQ16125 maven/mavencentral/javax.validation/validation-api/2.0.1.Final, Apache-2.0, approved, CQ15302 @@ -62,9 +68,6 @@ maven/mavencentral/net.minidev/json-smart/2.4.11, Apache-2.0, approved, #3288 maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apache.logging.log4j/log4j-api/2.17.2, Apache-2.0, approved, clearlydefined maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.17.2, Apache-2.0, approved, #2163 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/9.0.78, Apache-2.0 AND (CDDL-1.0 OR GPL-2.0 WITH Classpath-exception-2.0), approved, CQ20188 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/9.0.78, Apache-2.0, approved, CQ20193 -maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/9.0.78, Apache-2.0, approved, CQ20194 maven/mavencentral/org.aspectj/aspectjrt/1.9.7, EPL-1.0, approved, tools.aspectj maven/mavencentral/org.aspectj/aspectjweaver/1.9.7, EPL-1.0, approved, tools.aspectj maven/mavencentral/org.checkerframework/checker-qual/3.19.0, MIT, approved, clearlydefined @@ -80,57 +83,61 @@ maven/mavencentral/org.postgresql/postgresql/42.3.8, BSD-2-Clause, approved, #24 maven/mavencentral/org.reactivestreams/reactive-streams/1.0.4, CC0-1.0, approved, CQ16332 maven/mavencentral/org.slf4j/jul-to-slf4j/1.7.36, MIT, approved, CQ12842 maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368 -maven/mavencentral/org.springframework.amqp/spring-amqp/2.4.14, Apache-2.0, approved, #7514 -maven/mavencentral/org.springframework.amqp/spring-rabbit/2.4.14, Apache-2.0, approved, #7512 -maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/2.7.14, Apache-2.0, approved, #4314 -maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/2.7.14, Apache-2.0, approved, #4310 -maven/mavencentral/org.springframework.boot/spring-boot-starter-data-jpa/2.7.14, Apache-2.0, approved, #4379 -maven/mavencentral/org.springframework.boot/spring-boot-starter-jdbc/2.7.14, Apache-2.0, approved, #4401 -maven/mavencentral/org.springframework.boot/spring-boot-starter-json/2.7.14, Apache-2.0, approved, #4307 -maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/2.7.14, Apache-2.0, approved, #4327 -maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/2.7.14, Apache-2.0, approved, #7511 -maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-resource-server/2.7.14, Apache-2.0, approved, #4312 -maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/2.7.14, Apache-2.0, approved, #4305 -maven/mavencentral/org.springframework.boot/spring-boot-starter-web/2.7.14, Apache-2.0, approved, #4304 -maven/mavencentral/org.springframework.boot/spring-boot-starter/2.7.14, Apache-2.0, approved, #4308 -maven/mavencentral/org.springframework.boot/spring-boot/2.7.14, Apache-2.0, approved, #4322 +maven/mavencentral/org.springdoc/springdoc-openapi-common/1.7.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springdoc/springdoc-openapi-security/1.7.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springdoc/springdoc-openapi-ui/1.7.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springdoc/springdoc-openapi-webmvc-core/1.7.0, Apache-2.0, approved, clearlydefined +maven/mavencentral/org.springframework.amqp/spring-amqp/2.4.17, Apache-2.0, approved, #7514 +maven/mavencentral/org.springframework.amqp/spring-rabbit/2.4.17, Apache-2.0, approved, #7512 +maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/2.7.17, Apache-2.0, approved, #4314 +maven/mavencentral/org.springframework.boot/spring-boot-starter-aop/2.7.17, Apache-2.0, approved, #4310 +maven/mavencentral/org.springframework.boot/spring-boot-starter-data-jpa/2.7.17, Apache-2.0, approved, #4379 +maven/mavencentral/org.springframework.boot/spring-boot-starter-jdbc/2.7.17, Apache-2.0, approved, #4401 +maven/mavencentral/org.springframework.boot/spring-boot-starter-json/2.7.17, Apache-2.0, approved, #4307 +maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/2.7.17, Apache-2.0, approved, #4327 +maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-client/2.7.17, Apache-2.0, approved, #7511 +maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-resource-server/2.7.17, Apache-2.0, approved, #4312 +maven/mavencentral/org.springframework.boot/spring-boot-starter-web/2.7.17, Apache-2.0, approved, #4304 +maven/mavencentral/org.springframework.boot/spring-boot-starter/2.7.17, Apache-2.0, approved, #4308 +maven/mavencentral/org.springframework.boot/spring-boot/2.7.17, Apache-2.0, approved, #4322 maven/mavencentral/org.springframework.cloud/spring-cloud-bus/3.1.2, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework.cloud/spring-cloud-commons/3.1.5, Apache-2.0, approved, #4726 -maven/mavencentral/org.springframework.cloud/spring-cloud-context/3.1.5, Apache-2.0, approved, #4722 -maven/mavencentral/org.springframework.cloud/spring-cloud-starter/3.1.5, Apache-2.0, approved, #4723 -maven/mavencentral/org.springframework.data/spring-data-commons/2.7.14, Apache-2.0, approved, #2768 -maven/mavencentral/org.springframework.data/spring-data-jpa/2.7.14, Apache-2.0, approved, #2766 +maven/mavencentral/org.springframework.cloud/spring-cloud-commons/3.1.7, Apache-2.0, approved, #4726 +maven/mavencentral/org.springframework.cloud/spring-cloud-context/3.1.7, Apache-2.0, approved, #4722 +maven/mavencentral/org.springframework.cloud/spring-cloud-starter/3.1.7, Apache-2.0, approved, #4723 +maven/mavencentral/org.springframework.data/spring-data-commons/2.7.17, Apache-2.0, approved, #2768 +maven/mavencentral/org.springframework.data/spring-data-jpa/2.7.17, Apache-2.0, approved, #2766 maven/mavencentral/org.springframework.hateoas/spring-hateoas/1.5.5, Apache-2.0, approved, #6943 -maven/mavencentral/org.springframework.integration/spring-integration-core/5.5.18, Apache-2.0, approved, #7513 +maven/mavencentral/org.springframework.integration/spring-integration-core/5.5.19, Apache-2.0, approved, #7513 maven/mavencentral/org.springframework.plugin/spring-plugin-core/2.0.0.RELEASE, Apache-2.0, approved, #3049 maven/mavencentral/org.springframework.retry/spring-retry/1.3.4, Apache-2.0, approved, clearlydefined -maven/mavencentral/org.springframework.security/spring-security-aspects/5.7.10, Apache-2.0, approved, #7510 -maven/mavencentral/org.springframework.security/spring-security-config/5.7.10, Apache-2.0, approved, #4315 -maven/mavencentral/org.springframework.security/spring-security-core/5.7.10, Apache-2.0, approved, #4269 -maven/mavencentral/org.springframework.security/spring-security-crypto/5.7.10, Apache-2.0 AND ISC, approved, #4268 -maven/mavencentral/org.springframework.security/spring-security-oauth2-client/5.7.10, Apache-2.0, approved, #4326 -maven/mavencentral/org.springframework.security/spring-security-oauth2-core/5.7.10, Apache-2.0, approved, #4325 -maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/5.7.10, Apache-2.0, approved, #4317 -maven/mavencentral/org.springframework.security/spring-security-oauth2-resource-server/5.7.10, Apache-2.0, approved, #4306 -maven/mavencentral/org.springframework.security/spring-security-web/5.7.10, Apache-2.0, approved, #4319 -maven/mavencentral/org.springframework/spring-aop/5.3.29, Apache-2.0, approved, CQ23152 -maven/mavencentral/org.springframework/spring-aspects/5.3.29, Apache-2.0, approved, #1546 -maven/mavencentral/org.springframework/spring-beans/5.3.29, Apache-2.0, approved, CQ23153 -maven/mavencentral/org.springframework/spring-context-support/5.3.29, Apache-2.0, approved, #1540 -maven/mavencentral/org.springframework/spring-context/5.3.29, Apache-2.0, approved, CQ23051 -maven/mavencentral/org.springframework/spring-core/5.3.29, Apache-2.0 AND BSD-3-Clause, approved, CQ23154 -maven/mavencentral/org.springframework/spring-expression/5.3.29, Apache-2.0, approved, CQ23155 -maven/mavencentral/org.springframework/spring-jcl/5.3.29, Apache-2.0, approved, CQ23156 -maven/mavencentral/org.springframework/spring-jdbc/5.3.29, Apache-2.0, approved, #1545 -maven/mavencentral/org.springframework/spring-messaging/5.3.29, Apache-2.0, approved, #3404 -maven/mavencentral/org.springframework/spring-orm/5.3.29, Apache-2.0, approved, CQ23053 -maven/mavencentral/org.springframework/spring-tx/5.3.29, Apache-2.0, approved, CQ23055 -maven/mavencentral/org.springframework/spring-web/5.3.29, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23157 -maven/mavencentral/org.springframework/spring-webmvc/5.3.29, Apache-2.0, approved, CQ23158 -maven/mavencentral/org.springframework/spring-websocket/5.3.29, Apache-2.0, approved, #7516 +maven/mavencentral/org.springframework.security/spring-security-aspects/5.7.11, Apache-2.0, approved, #7510 +maven/mavencentral/org.springframework.security/spring-security-config/5.7.11, Apache-2.0, approved, #4315 +maven/mavencentral/org.springframework.security/spring-security-core/5.7.11, Apache-2.0, approved, #4269 +maven/mavencentral/org.springframework.security/spring-security-crypto/5.7.11, Apache-2.0 AND ISC, approved, #4268 +maven/mavencentral/org.springframework.security/spring-security-oauth2-client/5.7.11, Apache-2.0, approved, #4326 +maven/mavencentral/org.springframework.security/spring-security-oauth2-core/5.7.11, Apache-2.0, approved, #4325 +maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/5.7.11, Apache-2.0, approved, #4317 +maven/mavencentral/org.springframework.security/spring-security-oauth2-resource-server/5.7.11, Apache-2.0, approved, #4306 +maven/mavencentral/org.springframework.security/spring-security-web/5.7.11, Apache-2.0, approved, #4319 +maven/mavencentral/org.springframework/spring-aop/5.3.30, Apache-2.0, approved, CQ23152 +maven/mavencentral/org.springframework/spring-aspects/5.3.30, Apache-2.0, approved, #1546 +maven/mavencentral/org.springframework/spring-beans/5.3.30, Apache-2.0, approved, CQ23153 +maven/mavencentral/org.springframework/spring-context-support/5.3.30, Apache-2.0, approved, #1540 +maven/mavencentral/org.springframework/spring-context/5.3.30, Apache-2.0, approved, CQ23051 +maven/mavencentral/org.springframework/spring-core/5.3.30, Apache-2.0 AND BSD-3-Clause, approved, CQ23154 +maven/mavencentral/org.springframework/spring-expression/5.3.30, Apache-2.0, approved, CQ23155 +maven/mavencentral/org.springframework/spring-jcl/5.3.30, Apache-2.0, approved, CQ23156 +maven/mavencentral/org.springframework/spring-jdbc/5.3.30, Apache-2.0, approved, #1545 +maven/mavencentral/org.springframework/spring-messaging/5.3.30, Apache-2.0, approved, #3404 +maven/mavencentral/org.springframework/spring-orm/5.3.30, Apache-2.0, approved, CQ23053 +maven/mavencentral/org.springframework/spring-tx/5.3.30, Apache-2.0, approved, CQ23055 +maven/mavencentral/org.springframework/spring-web/5.3.30, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ23157 +maven/mavencentral/org.springframework/spring-webmvc/5.3.30, Apache-2.0, approved, CQ23158 +maven/mavencentral/org.springframework/spring-websocket/5.3.30, Apache-2.0, approved, #7516 maven/mavencentral/org.vaadin.alump.distributionbar/dbar-addon/3.0.1, Apache-2.0, approved, CQ22983 maven/mavencentral/org.vaadin.spring.addons/vaadin-spring-addon-eventbus/2.0.0.RELEASE, Apache-2.0, approved, clearlydefined maven/mavencentral/org.vaadin.spring.extensions/vaadin-spring-ext-core/2.0.0.RELEASE, Apache-2.0, approved, clearlydefined maven/mavencentral/org.vaadin.spring.extensions/vaadin-spring-ext-security/2.0.0.RELEASE, Apache-2.0, approved, clearlydefined maven/mavencentral/org.w3c.css/sac/1.3, Apache-2.0 OR CDDL-1.0, approved, CQ11059 +maven/mavencentral/org.webjars/swagger-ui/4.18.2, Apache-2.0, approved, #7850 maven/mavencentral/org.yaml/snakeyaml/1.33, Apache-2.0, approved, clearlydefined diff --git a/.3rd-party/hawkbit-maven.deps b/.3rd-party/hawkbit-maven.deps index 6185da0233..23250775dc 100644 --- a/.3rd-party/hawkbit-maven.deps +++ b/.3rd-party/hawkbit-maven.deps @@ -5,6 +5,7 @@ com.fasterxml.jackson.core:jackson-annotations:jar:2.13.5 com.fasterxml.jackson.core:jackson-core:jar:2.13.5 com.fasterxml.jackson.core:jackson-databind:jar:2.13.5 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:jar:2.13.5 +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:jar:2.13.5 com.fasterxml.jackson.datatype:jackson-datatype-jdk8:jar:2.13.5 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:jar:2.13.5 com.fasterxml.jackson.module:jackson-module-parameter-names:jar:2.13.5 @@ -16,12 +17,12 @@ com.github.gwtd3:gwt-d3-js:jar:sources:3.5.11 com.github.stephenc.jcip:jcip-annotations:jar:1.0-1 com.google.errorprone:error_prone_annotations:jar:2.10.0 com.google.guava:failureaccess:jar:1.0.1 -com.google.guava:guava:jar:32.1.1-jre +com.google.guava:guava:jar:32.1.2-jre com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava com.google.gwt:gwt-elemental:jar:2.8.2 com.google.gwt:gwt-user:jar:2.9.0 com.google.jsinterop:jsinterop-annotations:jar:2.0.0 -com.h2database:h2:jar:2.2.220 +com.h2database:h2:jar:2.2.222 com.jayway.jsonpath:json-path:jar:2.7.0 com.microsoft.sqlserver:mssql-jdbc:jar:10.2.3.jre8 com.nimbusds:content-type:jar:2.2 @@ -45,15 +46,20 @@ com.vaadin:vaadin-themes:jar:8.14.3 com.zaxxer:HikariCP:jar:4.0.3 commons-io:commons-io:jar:2.13.0 cz.jirutka.rsql:rsql-parser:jar:2.1.0 -io.projectreactor:reactor-core:jar:3.4.31 +io.projectreactor:reactor-core:jar:3.4.33 io.protostuff:protostuff-api:jar:1.8.0 io.protostuff:protostuff-collectionschema:jar:1.8.0 io.protostuff:protostuff-core:jar:1.8.0 io.protostuff:protostuff-runtime:jar:1.8.0 +io.swagger.core.v3:swagger-annotations:jar:2.2.9 +io.swagger.core.v3:swagger-core:jar:2.2.9 +io.swagger.core.v3:swagger-models:jar:2.2.9 +jakarta.activation:jakarta.activation-api:jar:1.2.2 jakarta.annotation:jakarta.annotation-api:jar:1.3.5 jakarta.persistence:jakarta.persistence-api:jar:2.2.3 jakarta.transaction:jakarta.transaction-api:jar:1.3.3 jakarta.validation:jakarta.validation-api:jar:2.0.2 +jakarta.xml.bind:jakarta.xml.bind-api:jar:2.3.3 javax.activation:javax.activation-api:jar:1.2.0 javax.servlet:javax.servlet-api:jar:4.0.1 javax.validation:validation-api:jar:2.0.1.Final @@ -63,9 +69,6 @@ net.minidev:json-smart:jar:2.4.11 org.apache.commons:commons-lang3:jar:3.12.0 org.apache.logging.log4j:log4j-api:jar:2.17.2 org.apache.logging.log4j:log4j-to-slf4j:jar:2.17.2 -org.apache.tomcat.embed:tomcat-embed-core:jar:9.0.78 -org.apache.tomcat.embed:tomcat-embed-el:jar:9.0.78 -org.apache.tomcat.embed:tomcat-embed-websocket:jar:9.0.78 org.aspectj:aspectjrt:jar:1.9.7 org.aspectj:aspectjweaver:jar:1.9.7 org.checkerframework:checker-qual:jar:3.19.0 @@ -81,57 +84,61 @@ org.postgresql:postgresql:jar:42.3.8 org.reactivestreams:reactive-streams:jar:1.0.4 org.slf4j:jul-to-slf4j:jar:1.7.36 org.slf4j:slf4j-api:jar:1.7.36 -org.springframework.amqp:spring-amqp:jar:2.4.14 -org.springframework.amqp:spring-rabbit:jar:2.4.14 -org.springframework.boot:spring-boot-autoconfigure:jar:2.7.14 -org.springframework.boot:spring-boot-starter-aop:jar:2.7.14 -org.springframework.boot:spring-boot-starter-data-jpa:jar:2.7.14 -org.springframework.boot:spring-boot-starter-jdbc:jar:2.7.14 -org.springframework.boot:spring-boot-starter-json:jar:2.7.14 -org.springframework.boot:spring-boot-starter-logging:jar:2.7.14 -org.springframework.boot:spring-boot-starter-oauth2-client:jar:2.7.14 -org.springframework.boot:spring-boot-starter-oauth2-resource-server:jar:2.7.14 -org.springframework.boot:spring-boot-starter-tomcat:jar:2.7.14 -org.springframework.boot:spring-boot-starter-web:jar:2.7.14 -org.springframework.boot:spring-boot-starter:jar:2.7.14 -org.springframework.boot:spring-boot:jar:2.7.14 +org.springdoc:springdoc-openapi-common:jar:1.7.0 +org.springdoc:springdoc-openapi-security:jar:1.7.0 +org.springdoc:springdoc-openapi-ui:jar:1.7.0 +org.springdoc:springdoc-openapi-webmvc-core:jar:1.7.0 +org.springframework.amqp:spring-amqp:jar:2.4.17 +org.springframework.amqp:spring-rabbit:jar:2.4.17 +org.springframework.boot:spring-boot-autoconfigure:jar:2.7.17 +org.springframework.boot:spring-boot-starter-aop:jar:2.7.17 +org.springframework.boot:spring-boot-starter-data-jpa:jar:2.7.17 +org.springframework.boot:spring-boot-starter-jdbc:jar:2.7.17 +org.springframework.boot:spring-boot-starter-json:jar:2.7.17 +org.springframework.boot:spring-boot-starter-logging:jar:2.7.17 +org.springframework.boot:spring-boot-starter-oauth2-client:jar:2.7.17 +org.springframework.boot:spring-boot-starter-oauth2-resource-server:jar:2.7.17 +org.springframework.boot:spring-boot-starter-web:jar:2.7.17 +org.springframework.boot:spring-boot-starter:jar:2.7.17 +org.springframework.boot:spring-boot:jar:2.7.17 org.springframework.cloud:spring-cloud-bus:jar:3.1.2 -org.springframework.cloud:spring-cloud-commons:jar:3.1.5 -org.springframework.cloud:spring-cloud-context:jar:3.1.5 -org.springframework.cloud:spring-cloud-starter:jar:3.1.5 -org.springframework.data:spring-data-commons:jar:2.7.14 -org.springframework.data:spring-data-jpa:jar:2.7.14 +org.springframework.cloud:spring-cloud-commons:jar:3.1.7 +org.springframework.cloud:spring-cloud-context:jar:3.1.7 +org.springframework.cloud:spring-cloud-starter:jar:3.1.7 +org.springframework.data:spring-data-commons:jar:2.7.17 +org.springframework.data:spring-data-jpa:jar:2.7.17 org.springframework.hateoas:spring-hateoas:jar:1.5.5 -org.springframework.integration:spring-integration-core:jar:5.5.18 +org.springframework.integration:spring-integration-core:jar:5.5.19 org.springframework.plugin:spring-plugin-core:jar:2.0.0.RELEASE org.springframework.retry:spring-retry:jar:1.3.4 -org.springframework.security:spring-security-aspects:jar:5.7.10 -org.springframework.security:spring-security-config:jar:5.7.10 -org.springframework.security:spring-security-core:jar:5.7.10 -org.springframework.security:spring-security-crypto:jar:5.7.10 -org.springframework.security:spring-security-oauth2-client:jar:5.7.10 -org.springframework.security:spring-security-oauth2-core:jar:5.7.10 -org.springframework.security:spring-security-oauth2-jose:jar:5.7.10 -org.springframework.security:spring-security-oauth2-resource-server:jar:5.7.10 -org.springframework.security:spring-security-web:jar:5.7.10 -org.springframework:spring-aop:jar:5.3.29 -org.springframework:spring-aspects:jar:5.3.29 -org.springframework:spring-beans:jar:5.3.29 -org.springframework:spring-context-support:jar:5.3.29 -org.springframework:spring-context:jar:5.3.29 -org.springframework:spring-core:jar:5.3.29 -org.springframework:spring-expression:jar:5.3.29 -org.springframework:spring-jcl:jar:5.3.29 -org.springframework:spring-jdbc:jar:5.3.29 -org.springframework:spring-messaging:jar:5.3.29 -org.springframework:spring-orm:jar:5.3.29 -org.springframework:spring-tx:jar:5.3.29 -org.springframework:spring-web:jar:5.3.29 -org.springframework:spring-webmvc:jar:5.3.29 -org.springframework:spring-websocket:jar:5.3.29 +org.springframework.security:spring-security-aspects:jar:5.7.11 +org.springframework.security:spring-security-config:jar:5.7.11 +org.springframework.security:spring-security-core:jar:5.7.11 +org.springframework.security:spring-security-crypto:jar:5.7.11 +org.springframework.security:spring-security-oauth2-client:jar:5.7.11 +org.springframework.security:spring-security-oauth2-core:jar:5.7.11 +org.springframework.security:spring-security-oauth2-jose:jar:5.7.11 +org.springframework.security:spring-security-oauth2-resource-server:jar:5.7.11 +org.springframework.security:spring-security-web:jar:5.7.11 +org.springframework:spring-aop:jar:5.3.30 +org.springframework:spring-aspects:jar:5.3.30 +org.springframework:spring-beans:jar:5.3.30 +org.springframework:spring-context-support:jar:5.3.30 +org.springframework:spring-context:jar:5.3.30 +org.springframework:spring-core:jar:5.3.30 +org.springframework:spring-expression:jar:5.3.30 +org.springframework:spring-jcl:jar:5.3.30 +org.springframework:spring-jdbc:jar:5.3.30 +org.springframework:spring-messaging:jar:5.3.30 +org.springframework:spring-orm:jar:5.3.30 +org.springframework:spring-tx:jar:5.3.30 +org.springframework:spring-web:jar:5.3.30 +org.springframework:spring-webmvc:jar:5.3.30 +org.springframework:spring-websocket:jar:5.3.30 org.vaadin.alump.distributionbar:dbar-addon:jar:3.0.1 org.vaadin.spring.addons:vaadin-spring-addon-eventbus:jar:2.0.0.RELEASE org.vaadin.spring.extensions:vaadin-spring-ext-core:jar:2.0.0.RELEASE org.vaadin.spring.extensions:vaadin-spring-ext-security:jar:2.0.0.RELEASE org.w3c.css:sac:jar:1.3 +org.webjars:swagger-ui:jar:4.18.2 org.yaml:snakeyaml:jar:1.33 diff --git a/.circleci/config.yml b/.circleci/config.yml index a93c9a21db..2cd60e21f4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,10 +1,11 @@ # -# Copyright (c) 2018 Bosch Software Innovations GmbH and others. +# Copyright (c) 2018 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # version: 2 diff --git a/.circleci/run-qa.sh b/.circleci/run-qa.sh index b17c2efbb7..92d357531e 100755 --- a/.circleci/run-qa.sh +++ b/.circleci/run-qa.sh @@ -1,11 +1,12 @@ #!/bin/sh # -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. +# Copyright (c) 2015 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # #echo "$CIRCLE_PULL_REQUEST pull request" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e69fd0d40b..460b78ccdb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -102,12 +102,13 @@ Please make sure newly created files contain a proper license header like this: ```java /** - * Copyright (c) and others. + * Copyright (c) {date} {owner} [and others] * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ ``` diff --git a/LICENSE b/LICENSE index 3260e4f239..e23ece2c85 100644 --- a/LICENSE +++ b/LICENSE @@ -1,204 +1,277 @@ -Eclipse Public License - v 1.0 +Eclipse Public License - v 2.0 -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC -LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM -CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 1. DEFINITIONS "Contribution" means: -a) in the case of the initial Contributor, the initial code and documentation - distributed under this Agreement, and -b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and - where such changes and/or additions to the Program originate from and are - distributed by that particular Contributor. A Contribution 'originates' - from a Contributor if it was added to the Program by such Contributor - itself or anyone acting on such Contributor's behalf. Contributions do not - include additions to the Program which: (i) are separate modules of - software distributed in conjunction with the Program under their own - license agreement, and (ii) are not derivative works of the Program. + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + where such changes and/or additions to the Program originate from + and are Distributed by that particular Contributor. A Contribution + "originates" from a Contributor if it was added to the Program by + such Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include changes or additions to the Program that + are not Modified Works. -"Contributor" means any person or entity that distributes the Program. +"Contributor" means any person or entity that Distributes the Program. -"Licensed Patents" mean patent claims licensable by a Contributor which are -necessarily infringed by the use or sale of its Contribution alone or when -combined with the Program. +"Licensed Patents" mean patent claims licensable by a Contributor which +are necessarily infringed by the use or sale of its Contribution alone +or when combined with the Program. -"Program" means the Contributions distributed in accordance with this +"Program" means the Contributions Distributed in accordance with this Agreement. -"Recipient" means anyone who receives the Program under this Agreement, -including all Contributors. +"Recipient" means anyone who receives the Program under this Agreement +or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other +form, that is based on (or derived from) the Program and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that +results from an addition to, deletion from, or modification of the +contents of the Program, including, for purposes of clarity any new file +in Source Code form that contains any contents of the Program. Modified +Works shall not include works that contain only declarations, +interfaces, types, classes, structures, or files of the Program solely +in each case in order to link to, bind by name, or subclass the Program +or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available +in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making +modifications, including but not limited to software source code, +documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, +Version 2.0, or any later versions of that license, including any +exceptions or additional permissions as identified by the initial +Contributor. 2. GRANT OF RIGHTS - a) Subject to the terms of this Agreement, each Contributor hereby grants - Recipient a non-exclusive, worldwide, royalty-free copyright license to - reproduce, prepare derivative works of, publicly display, publicly - perform, distribute and sublicense the Contribution of such Contributor, - if any, and such derivative works, in source code and object code form. - b) Subject to the terms of this Agreement, each Contributor hereby grants - Recipient a non-exclusive, worldwide, royalty-free patent license under - Licensed Patents to make, use, sell, offer to sell, import and otherwise - transfer the Contribution of such Contributor, if any, in source code and - object code form. This patent license shall apply to the combination of - the Contribution and the Program if, at the time the Contribution is - added by the Contributor, such addition of the Contribution causes such - combination to be covered by the Licensed Patents. The patent license - shall not apply to any other combinations which include the Contribution. - No hardware per se is licensed hereunder. - c) Recipient understands that although each Contributor grants the licenses - to its Contributions set forth herein, no assurances are provided by any - Contributor that the Program does not infringe the patent or other - intellectual property rights of any other entity. Each Contributor - disclaims any liability to Recipient for claims brought by any other - entity based on infringement of intellectual property rights or - otherwise. As a condition to exercising the rights and licenses granted - hereunder, each Recipient hereby assumes sole responsibility to secure - any other intellectual property rights needed, if any. For example, if a - third party patent license is required to allow Recipient to distribute - the Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - d) Each Contributor represents that to its knowledge it has sufficient - copyright rights in its Contribution, if any, to grant the copyright - license set forth in this Agreement. + + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, + if any, in Source Code or other form. This patent license shall + apply to the combination of the Contribution and the Program if, at + the time the Contribution is added by the Contributor, such addition + of the Contribution causes such combination to be covered by the + Licensed Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se is + licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. + Each Contributor disclaims any liability to Recipient for claims + brought by any other entity based on infringement of intellectual + property rights or otherwise. As a condition to exercising the + rights and licenses granted hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual + property rights needed, if any. For example, if a third party + patent license is required to allow Recipient to Distribute the + Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + + d) Each Contributor represents that to its knowledge it has + sufficient copyright rights in its Contribution, if any, to grant + the copyright license set forth in this Agreement. + + e) Notwithstanding the terms of any Secondary License, no + Contributor makes additional grants to any Recipient (other than + those set forth in this Agreement) as a result of such Recipient's + receipt of the Program under the terms of a Secondary License + (if permitted under the terms of Section 3). 3. REQUIREMENTS -A Contributor may choose to distribute the Program in object code form under -its own license agreement, provided that: - - a) it complies with the terms and conditions of this Agreement; and - b) its license agreement: - i) effectively disclaims on behalf of all Contributors all warranties - and conditions, express and implied, including warranties or - conditions of title and non-infringement, and implied warranties or - conditions of merchantability and fitness for a particular purpose; - ii) effectively excludes on behalf of all Contributors all liability for - damages, including direct, indirect, special, incidental and - consequential damages, such as lost profits; - iii) states that any provisions which differ from this Agreement are - offered by that Contributor alone and not by any other party; and - iv) states that source code for the Program is available from such - Contributor, and informs licensees how to obtain it in a reasonable - manner on or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - - a) it must be made available under this Agreement; and - b) a copy of this Agreement must be included with each copy of the Program. - Contributors may not remove or alter any copyright notices contained - within the Program. - -Each Contributor must identify itself as the originator of its Contribution, -if -any, in a manner that reasonably allows subsequent Recipients to identify the -originator of the Contribution. +3.1 If a Contributor Distributes the Program in any form, then: + + a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; + + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and + + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. + +3.2 When the Program is Distributed as Source Code: + + a) it must be made available under this Agreement, or if the + Program (i) is combined with other material in a separate file or + files made available under a Secondary License, and (ii) the initial + Contributor attached to the Source Code the notice described in + Exhibit A of this Agreement, then the Program may be made available + under the terms of such Secondary Licenses, and + + b) a copy of this Agreement must be included with each copy of + the Program. + +3.3 Contributors may not remove or alter any copyright, patent, +trademark, attribution notices, disclaimers of warranty, or limitations +of liability ("notices") contained within the Program from any copy of +the Program which they Distribute, provided that Contributors may add +their own appropriate notices. 4. COMMERCIAL DISTRIBUTION -Commercial distributors of software may accept certain responsibilities with -respect to end users, business partners and the like. While this license is -intended to facilitate the commercial use of the Program, the Contributor who -includes the Program in a commercial product offering should do so in a manner -which does not create potential liability for other Contributors. Therefore, -if a Contributor includes the Program in a commercial product offering, such -Contributor ("Commercial Contributor") hereby agrees to defend and indemnify -every other Contributor ("Indemnified Contributor") against any losses, -damages and costs (collectively "Losses") arising from claims, lawsuits and -other legal actions brought by a third party against the Indemnified -Contributor to the extent caused by the acts or omissions of such Commercial -Contributor in connection with its distribution of the Program in a commercial -product offering. The obligations in this section do not apply to any claims -or Losses relating to any actual or alleged intellectual property -infringement. In order to qualify, an Indemnified Contributor must: -a) promptly notify the Commercial Contributor in writing of such claim, and -b) allow the Commercial Contributor to control, and cooperate with the -Commercial Contributor in, the defense and any related settlement -negotiations. The Indemnified Contributor may participate in any such claim at -its own expense. - -For example, a Contributor might include the Program in a commercial product -offering, Product X. That Contributor is then a Commercial Contributor. If -that Commercial Contributor then makes performance claims, or offers -warranties related to Product X, those performance claims and warranties are -such Commercial Contributor's responsibility alone. Under this section, the -Commercial Contributor would have to defend claims against the other -Contributors related to those performance claims and warranties, and if a -court requires any other Contributor to pay any damages as a result, the -Commercial Contributor must pay those damages. +Commercial distributors of software may accept certain responsibilities +with respect to end users, business partners and the like. While this +license is intended to facilitate the commercial use of the Program, +the Contributor who includes the Program in a commercial product +offering should do so in a manner which does not create potential +liability for other Contributors. Therefore, if a Contributor includes +the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and indemnify every +other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits +and other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program +in a commercial product offering. The obligations in this section do not +apply to any claims or Losses relating to any actual or alleged +intellectual property infringement. In order to qualify, an Indemnified +Contributor must: a) promptly notify the Commercial Contributor in +writing of such claim, and b) allow the Commercial Contributor to control, +and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those performance +claims and warranties, and if a court requires any other Contributor to +pay any damages as a result, the Commercial Contributor must pay +those damages. 5. NO WARRANTY -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR -IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, -NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each -Recipient is solely responsible for determining the appropriateness of using -and distributing the Program and assumes all risks associated with its -exercise of rights under this Agreement , including but not limited to the -risks and costs of program errors, compliance with applicable laws, damage to -or loss of data, programs or equipment, and unavailability or interruption of -operations. +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF +TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR +PURPOSE. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all +risks associated with its exercise of rights under this Agreement, +including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs +or equipment, and unavailability or interruption of operations. 6. DISCLAIMER OF LIABILITY -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY -CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION -LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS +SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE -EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY -OF SUCH DAMAGES. +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. 7. GENERAL If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of the -remainder of the terms of this Agreement, and without further action by the -parties hereto, such provision shall be reformed to the minimum extent -necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Program itself -(excluding combinations of the Program with other software or hardware) -infringes such Recipient's patent(s), then such Recipient's rights granted -under Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to -comply with any of the material terms or conditions of this Agreement and does -not cure such failure in a reasonable period of time after becoming aware of -such noncompliance. If all Recipient's rights under this Agreement terminate, -Recipient agrees to cease use and distribution of the Program as soon as -reasonably practicable. However, Recipient's obligations under this Agreement -and any licenses granted by Recipient relating to the Program shall continue -and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in -order to avoid inconsistency the Agreement is copyrighted and may only be -modified in the following manner. The Agreement Steward reserves the right to -publish new versions (including revisions) of this Agreement from time to -time. No one other than the Agreement Steward has the right to modify this -Agreement. The Eclipse Foundation is the initial Agreement Steward. The -Eclipse Foundation may assign the responsibility to serve as the Agreement -Steward to a suitable separate entity. Each new version of the Agreement will -be given a distinguishing version number. The Program (including -Contributions) may always be distributed subject to the version of the -Agreement under which it was received. In addition, after a new version of the -Agreement is published, Contributor may elect to distribute the Program -(including its Contributions) under the new version. Except as expressly -stated in Sections 2(a) and 2(b) above, Recipient receives no rights or -licenses to the intellectual property of any Contributor under this Agreement, -whether expressly, by implication, estoppel or otherwise. All rights in the -Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the -intellectual property laws of the United States of America. No party to this -Agreement will bring a legal action under this Agreement more than one year -after the cause of action arose. Each party waives its rights to a jury trial in -any resulting litigation. +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further +action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other software +or hardware) infringes such Recipient's patent(s), then such Recipient's +rights granted under Section 2(b) shall terminate as of the date such +litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of +time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use +and distribution of the Program as soon as reasonably practicable. +However, Recipient's obligations under this Agreement and any licenses +granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, +but in order to avoid inconsistency the Agreement is copyrighted and +may only be modified in the following manner. The Agreement Steward +reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement +Steward has the right to modify this Agreement. The Eclipse Foundation +is the initial Agreement Steward. The Eclipse Foundation may assign the +responsibility to serve as the Agreement Steward to a suitable separate +entity. Each new version of the Agreement will be given a distinguishing +version number. The Program (including Contributions) may always be +Distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to Distribute the Program (including its +Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient +receives no rights or licenses to the intellectual property of any +Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted +under this Agreement are reserved. Nothing in this Agreement is intended +to be enforceable by any entity that is not a Contributor or Recipient. +No third-party beneficiary rights are created under this Agreement. + +Exhibit A - Form of Secondary Licenses Notice + +"This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set forth +in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), +version(s), and exceptions or additional permissions here}." + + Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to + look for such a notice. + You may add additional accurate notices of copyright ownership. \ No newline at end of file diff --git a/README.md b/README.md index 4966a583be..2964f57e0c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@

- + # Eclipse hawkBit™ - Update Server - Fork from devolo GmbH -Eclipse [hawkBit](http://www.eclipse.org/hawkbit/index.html) is an domain independent back end solution for rolling out software updates to constrained edge devices as well as more powerful controllers and gateways connected to IP based networking infrastructure. +Eclipse [hawkBit](http://www.eclipse.org/hawkbit/index.html) is a domain independent back end solution for rolling out software updates to constrained edge devices as well as more powerful controllers and gateways connected to IP based networking infrastructure. This is a fork maintained by [devolo GmbH,](https://www.devolo.com) Germany. @@ -44,7 +44,7 @@ In addition the following vendors offer free trial accounts for their hawkBit co # Device Integration (Client libraries) -hawkBit exposes HTTP/JSon based [Direct Device Integration (API) API](https://www.eclipse.org/hawkbit/apis/ddi_api/) that allow any update client to integrate quite easily. +hawkBit exposes HTTP/JSON based [Direct Device Integration (API) API](https://www.eclipse.org/hawkbit/apis/ddi_api/) that allow any update client to integrate quite easily. The [Eclipse Hara subproject](https://projects.eclipse.org/projects/iot.hawkbit.hara) aims to provide a reference agent software implementation of the Eclipse hawkBit device API. The [hara-ddiclient repository](https://github.com/eclipse/hara-ddiclient) provides: @@ -70,7 +70,7 @@ There are clients outside of the Eclipse IoT eco system as well, e.g.: # Runtime dependencies and support -## Java Runtime Environment: 1.8,11 +## Java Runtime Environment: 17 ## SQL database @@ -100,6 +100,8 @@ Open the update server in your browser: See below for how to build and run the update server on your own. In addition we have a [guide](https://www.eclipse.org/hawkbit/guides/runhawkbit/) for setting up a complete landscape. +**Note**: this docker image supports both DDI and DMF APIs. However, in order to have DMF API working you shall have started additionally RabbitMQ on localhost:5672 with user guest/guest. Then the DMF will use / vhost. See more at [guide](https://www.eclipse.org/hawkbit/guides/runhawkbit/) -> _Configure RabbitMQ connection settings_. + # hawkBit (Spring boot) starters Next to the [Update Server](hawkbit-runtime/hawkbit-update-server) we are also providing a set of [Spring Boot Starters](hawkbit-starters) to quick start your own [Spring Boot](https://projects.spring.io/spring-boot/) based application. diff --git a/check-dependencies.sh b/check-dependencies.sh index 85bf315321..de4debeb68 100755 --- a/check-dependencies.sh +++ b/check-dependencies.sh @@ -1,11 +1,12 @@ #!/bin/bash # -# Copyright (c) 2023 Bosch.IO GmbH and others. +# Copyright (c) 2023 Bosch.IO GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # DASH_LICENSE_JAR=$1 diff --git a/docs/.gitignore b/docs/.gitignore new file mode 100644 index 0000000000..19ea11e3f0 --- /dev/null +++ b/docs/.gitignore @@ -0,0 +1,12 @@ +# rest api doc +content/rest-api/*.json +content/rest-api/*.html +# npm leftover +node_modules +package.json +package-lock.json +# themse +themes +# hugo +public +.hugo_build.lock diff --git a/docs/README.md b/docs/README.md index 66bb970eaf..21dda6a65d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -4,18 +4,19 @@ theme. Compiling the documentation is not included within the regular Maven buil ## Prerequisites 1. **Install Hugo**: see [installing Hugo](https://gohugo.io/getting-started/installing/) documentation on how to install Hugo. -2. **Install hawkBit**: run `mvn install` in the parent directory to generate the latest REST docs for hawkBit. +2. **Install NODE.js and npm** see [installing Node.js and npm](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm) documentation on how to install Node.js and npm +3. **Install Redocly CLI** see [installing Redocly CLI](https://redocly.com/docs/cli/installation/) documentation on how to install Redocly CLI +4. **Install hawkBit**: run `mvn install` in the parent directory to generate the latest REST docs for hawkBit. ## Build and Serve documentation The following Maven targets are available in order to build and serve the documentation: * `mvn install`: _i._ Copies the generated REST docs to `content/rest-api/` and _ii._ downloads the required Hugo theme -* `mvn site`: Serve the documentation on [localhost:1313/hawkbit/](localhost:1313/hawkbit/) -* `mvn clean`: Delete generated artifacts (REST docs, Hugo theme) - -_Note: Currently, **only** Unix/macOS is supported! For Windows, use the hugo commands in CMD._ +* `mvn site`: Serve the documentation on [localhost:1313/hawkbit/](http://localhost:1313/hawkbit/) + _Note_: the local port could be different. Please, look at the _mvn site_ command output. +* `mvn clean`: Delete generated artifacts (REST docs, Hugo theme) ## Generate /public folder In order to generate the `/public` folder, which can be put on a web-server, run the following command: diff --git a/docs/build-htmls.bat b/docs/build-htmls.bat new file mode 100644 index 0000000000..c80bb62d80 --- /dev/null +++ b/docs/build-htmls.bat @@ -0,0 +1,38 @@ +@echo off +@REM +@REM Copyright (c) 2023 Bosch.IO GmbH and others +@REM +@REM This program and the accompanying materials are made +@REM available under the terms of the Eclipse Public License 2.0 +@REM which is available at https://www.eclipse.org/legal/epl-2.0/ +@REM +@REM SPDX-License-Identifier: EPL-2.0 +@REM + +rem Checking for Redoc CLI and npm +call npx @redocly/cli --version 1> nul 2> nul + +if ERRORLEVEL 1 ( + echo [ERROR] Redoc CLI is not installed! Please make suer to install it before trying again. + exit 1 +) + +rem Execute the npx command +call npx @redocly/cli build-docs %cd%\content\rest-api\mgmt.yaml -o %cd%\content\rest-api\mgmt.html + +if ERRORLEVEL 1 ( + echo [ERROR] Failed to execute the Redoc CLI command form MGMT API. + exit 1 +) else ( + echo [INFO] Successfully executed the Redoc CLI command for MGMT API. +) + +rem Execute the npx command +call npx @redocly/cli build-docs %cd%\content\rest-api\ddi.yaml -o %cd%\content\rest-api\ddi.html + +if ERRORLEVEL 1 ( + echo [ERROR] Failed to execute the Redoc CLI command form DDI API. + exit 1 +) else ( + echo [INFO] Successfully executed the Redoc CLI command for DDI API. +) \ No newline at end of file diff --git a/docs/build-htmls.sh b/docs/build-htmls.sh new file mode 100644 index 0000000000..36dee54fc7 --- /dev/null +++ b/docs/build-htmls.sh @@ -0,0 +1,41 @@ +# +# Copyright (c) 2018 Bosch Software Innovations GmbH and others +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# + +#!/bin/bash + +CURRENT_DIR=$(pwd) + +# Checking for Redoc CLI and npm +npx @redocly/cli --version > /dev/null 2>&1 + +if [ $? != 0 ]; then + echo "[ERROR] Redoc CLI is not installed! Please make suer to install it before trying again." + exit 1 +fi + +# Execute the npx command +npx @redocly/cli build-docs ${CURRENT_DIR}/content/rest-api/mgmt.yaml -o ${CURRENT_DIR}/content/rest-api/mgmt.html + +if [ $? != 0 ]; then + echo "[ERROR] Failed to execute the Redoc CLI command form MGMT API." + exit 1 +else + echo "[INFO] Successfully executed the Redoc CLI command for MGMT API." +fi + +# Execute the npx command +npx @redocly/cli build-docs ${CURRENT_DIR}/content/rest-api/ddi.yaml -o ${CURRENT_DIR}/content/rest-api/ddi.html + +if [ $? != 0 ]; then + echo "[ERROR] Failed to execute the Redoc CLI command form DDI API." + exit 1 +else + echo "[INFO] Successfully executed the Redoc CLI command for DDI API." +fi \ No newline at end of file diff --git a/docs/cleanup.bat b/docs/cleanup.bat index ad121ee42b..d8b5ab0e76 100644 --- a/docs/cleanup.bat +++ b/docs/cleanup.bat @@ -1,11 +1,12 @@ @echo off @REM -@REM Copyright (c) 2018 Bosch Software Innovations GmbH and others. +@REM Copyright (c) 2023 Bosch.IO GmbH and others @REM -@REM All rights reserved. This program and the accompanying materials -@REM are made available under the terms of the Eclipse Public License v1.0 -@REM which accompanies this distribution, and is available at -@REM http://www.eclipse.org/legal/epl-v10.html +@REM This program and the accompanying materials are made +@REM available under the terms of the Eclipse Public License 2.0 +@REM which is available at https://www.eclipse.org/legal/epl-2.0/ +@REM +@REM SPDX-License-Identifier: EPL-2.0 @REM rem This script is used to clean up the previously generated or downloaded files. @@ -19,5 +20,3 @@ echo [INFO] echo [INFO] Remove generated REST docs del /Q content\rest-api\*.html echo [INFO] ... done - - diff --git a/docs/cleanup.sh b/docs/cleanup.sh index 0c67587699..3a4d60a06b 100644 --- a/docs/cleanup.sh +++ b/docs/cleanup.sh @@ -1,10 +1,11 @@ # -# Copyright (c) 2018 Bosch Software Innovations GmbH and others. +# Copyright (c) 2018 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # This script is used to clean up the previously generated or downloaded files. @@ -19,6 +20,7 @@ echo "[INFO] ... done" echo "[INFO] " echo "[INFO] Remove generated REST docs" +rm -f content/rest-api/*.json rm -f content/rest-api/*.html echo "[INFO] ... done" diff --git a/docs/config.toml b/docs/config.toml index 551f942245..9ec4265796 100755 --- a/docs/config.toml +++ b/docs/config.toml @@ -1,10 +1,11 @@ # -# Copyright (c) 2018 Bosch Software Innovations GmbH and others. +# Copyright (c) 2018 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # baseurl = "https://eclipse.dev/hawkbit/" diff --git a/docs/content/apis/ddi_api.md b/docs/content/apis/ddi_api.md index 4cb980e483..3a7efbb66e 100644 --- a/docs/content/apis/ddi_api.md +++ b/docs/content/apis/ddi_api.md @@ -31,5 +31,6 @@ PROCEEDING | This can be used by the target to inform that it i SCHEDULED | This can be used by the target to inform that it scheduled on the action. | RUNNING RESUMED | This can be used by the target to inform that it continued to work on the action. | RUNNING +## DDI APIs - \ No newline at end of file + diff --git a/docs/content/apis/management_api.md b/docs/content/apis/management_api.md index b1f300daa3..5070b504c9 100644 --- a/docs/content/apis/management_api.md +++ b/docs/content/apis/management_api.md @@ -1,10 +1,10 @@ ---- +--- title: Management API parent: API weight: 81 --- -The Management API is a RESTful API that enables to perform Create/Read/Update/Delete operations for provisioning targets (i.e. devices) and repository content (i.e. software). +The Management API is a RESTful API that enables to perform Create/Read/Update/Delete operations for provisioning targets (i.e. devices) and repository content (i.e. software). Based on the Management API you can manage and monitor software update operations via HTTP/HTTPS. The _Management API_ supports JSON payload with hypermedia as well as filtering, sorting and paging. Furthermore the Management API provides permission based access control and standard roles as well as custom role creation. @@ -26,22 +26,6 @@ Supported HTTP-methods are: - PUT - DELETE -Available Management APIs resources are: - -- [Targets](/hawkbit/apis/mgmt/targets/) -- [Target types](/hawkbit/apis/mgmt/targettypes/) -- [Distribution sets](/hawkbit/apis/mgmt/distributionsets/) -- [Distribution set types](/hawkbit/apis/mgmt/distributionsettypes/) -- [Software modules](/hawkbit/apis/mgmt/softwaremodules/) -- [Software module types](/hawkbit/apis/mgmt/softwaremoduletypes/) -- [Target tag](/hawkbit/apis/mgmt/targettag/) -- [Distribution set tag](/hawkbit/apis/mgmt/distributionsettag/) -- [Rollouts](/hawkbit/apis/mgmt/rollouts/) -- [Actions](/hawkbit/apis/mgmt/actions/) -- [Target filters](/hawkbit/apis/mgmt/targetfilters/) -- [System configuration](/hawkbit/apis/mgmt/tenant/) - - ## Headers For all requests an `Authorization` header has to be set. @@ -77,4 +61,9 @@ A _Distribution Set_ entity may have for example URIs to artifacts, _Software Mo "metadata": { "href": "http://localhost:8080/rest/v1/softwaremodules/83/metadata?offset=0&limit=50" } -``` \ No newline at end of file +``` + +## Management APIs + + + diff --git a/docs/content/apis/mgmt/_index.md b/docs/content/apis/mgmt/_index.md deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/docs/content/apis/mgmt/distributionsets.md b/docs/content/apis/mgmt/distributionsets.md deleted file mode 100644 index 50952749bb..0000000000 --- a/docs/content/apis/mgmt/distributionsets.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Distribution Sets API -parent: Management API -weight: -101 ---- - - \ No newline at end of file diff --git a/docs/content/apis/mgmt/distributionsettag.md b/docs/content/apis/mgmt/distributionsettag.md deleted file mode 100644 index 975b87b920..0000000000 --- a/docs/content/apis/mgmt/distributionsettag.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Distribution Set Tag API -parent: Management API -weight: -105 ---- - - \ No newline at end of file diff --git a/docs/content/apis/mgmt/distributionsettypes.md b/docs/content/apis/mgmt/distributionsettypes.md deleted file mode 100644 index d9a97e3c58..0000000000 --- a/docs/content/apis/mgmt/distributionsettypes.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Distribution Set Types API -parent: Management API -weight: -102 ---- - - \ No newline at end of file diff --git a/docs/content/apis/mgmt/rollouts.md b/docs/content/apis/mgmt/rollouts.md deleted file mode 100644 index 26192da3f2..0000000000 --- a/docs/content/apis/mgmt/rollouts.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Rollouts API -parent: Management API -weight: -106 ---- - - \ No newline at end of file diff --git a/docs/content/apis/mgmt/softwaremodules.md b/docs/content/apis/mgmt/softwaremodules.md deleted file mode 100644 index 3e340452fd..0000000000 --- a/docs/content/apis/mgmt/softwaremodules.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Software Modules API -parent: Management API -weight: -103 ---- - - \ No newline at end of file diff --git a/docs/content/apis/mgmt/softwaremoduletypes.md b/docs/content/apis/mgmt/softwaremoduletypes.md deleted file mode 100644 index a537d4a9e4..0000000000 --- a/docs/content/apis/mgmt/softwaremoduletypes.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Software Module Types API -parent: Management API -weight: -100 ---- - - \ No newline at end of file diff --git a/docs/content/apis/mgmt/targetfilters.md b/docs/content/apis/mgmt/targetfilters.md deleted file mode 100644 index 7c3e22231b..0000000000 --- a/docs/content/apis/mgmt/targetfilters.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Target Filters API -parent: Management API -weight: -107 ---- - - \ No newline at end of file diff --git a/docs/content/apis/mgmt/targets.md b/docs/content/apis/mgmt/targets.md deleted file mode 100644 index 1557cf190b..0000000000 --- a/docs/content/apis/mgmt/targets.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Targets API -parent: Management API -weight: -100 ---- - - \ No newline at end of file diff --git a/docs/content/apis/mgmt/targettag.md b/docs/content/apis/mgmt/targettag.md deleted file mode 100644 index 671536304c..0000000000 --- a/docs/content/apis/mgmt/targettag.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: Target Tag API -parent: Management API -weight: -104 ---- - - \ No newline at end of file diff --git a/docs/content/apis/mgmt/tenant.md b/docs/content/apis/mgmt/tenant.md deleted file mode 100644 index e472cca53a..0000000000 --- a/docs/content/apis/mgmt/tenant.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -title: System Configuration API -parent: Management API -weight: -108 ---- - - \ No newline at end of file diff --git a/docs/content/concepts/authentication.md b/docs/content/concepts/authentication.md index 8f618696ae..4a296c5940 100644 --- a/docs/content/concepts/authentication.md +++ b/docs/content/concepts/authentication.md @@ -62,6 +62,200 @@ The activation for the individual tenant: ![Enable Anonymous Download](../../images/security/anonymousDownload.png) +### Certificate Authentication by Reverse Proxy + +hawkBit offers a certificate-based authentication mechanism, also known as mutual TLS (mTLS), which eliminates the need to share a security token with the server. To implement this, you'll require a reverse proxy deployed in front of the hawkBit server to handle authentication. This process involves obtaining certificates (and keys) for both the client and the reverse proxy and configuring hawkBit accordingly. + +Initially, you'll need to obtain certificates (and keys) for these components from the same or different Certificate Authorities (CAs). Once you have acquired certificates you have to set them up to both the client and the hawkBit server. + +Then you shall enable *Allow targets to authenticate via a certificate authenticated by a reverse proxy* and set the fingerprint of the client certificate issuer(s) (as a comma separated list). + +To authenticate the request to hawBit the following condition shall be met: +- the common name of the client certificate shall match the controller/client id +- the SSL Issuer(s) hash of the presented client certificate shall be set for the tenant. For that, in Hawkbit's UI section, under system configuration, you shall enable 'Allow targets to authenticate via a certificate by an reverse proxy' and set the hash of the client certificate issuer(s) (as a comma separated list). + +![Example Reverse Proxy Settings](../../images/security/exampleReverseProxySettings.png) + +You can use the following command to get the issuer hash: + +```shell +openssl x509 -in client_certificate.crt -issuer_hash -noout` +``` + +Here is an example diagram that shows all the communication between the hawkBit, reverse proxy and client. For the sake of simplification we assume that there are not intermediate certificates and the certificate and key are as follows: + +- client_ca.crt signs client.crt +- server_ca.crt signs server.crt + +- client has the client.crt, client.key and server_ca.crt +- server (in this case reverse proxy) has the server.crt, server.key and client_ca.crt + +![Example Reverse Proxy Architecture](../../images/security/exampleReverseProxyArchitecture.png) + +#### Example - Nginx Reverse Proxy Configurations + +Nginx doesn't support obtaining the issuer hash without addons. Therefore, in this example we bypass sending real SSL Issuer hash to hawhBit but do certificate issuer validation at Nginx and then supply shared (between Nginx and hawkBit) fixed hash "Hawkbit". You could use any value here as long as it is matched with the *Allow targets to authenticate via a certificate authenticated by a reverse proxy* setting in the hawkBit UI. Note that for multi-tenant scenarios with different trusted CAs this example won't work. + +1. Hawkbit Configurations + + There are also some configurations that you need update when you deployed your hawkbit service. + + You need to add the given setting to your hawkBit configurations so that hawkBit can generate the URLs according to the https that the client will use to download. If you're deploying hawkBit as a Docker container, add these configurations as environmental values in the docker-compose.yml file. + +``` +server.forward-headers-strategy=NATIVE +``` + +2. In Hawkbit's UI section, under system configuration, make sure to select *Allow targets to authenticate via a certificate authenticated by a reverse proxy* and input the fixed issuer hash as "Hawkbit". This can be whetever you have configured in the nginx configuration in `proxy_set_header X-Ssl-Issuer-Hash-1` below. + +3. After placing your certificates and keys, you need to deploy your proxy server and apply the provided configurations. You can apply mutual TLS specifically to the URL given below to implement the process only for devices using the Device Integration API: + + `hawkbit.dev.example.com/default/controller/` + + This ensures that other clients, like UI users, can connect to hawkBit without requiring client certificates. They can use Username and Password in the Management API, eliminating the need for authentication and making it more user-friendly. + +```nginx +# Nginx Hawkbit Configurations + +# Gets the Common Name of the certificate from the client certificate. +map $ssl_client_s_dn $ssl_client_s_dn_cn { + default ""; + ~CN=(?[^,]+) $CN; +} + +server { + listen 80; + listen [::]:80; + + server_name hawkbit.dev.example.com www.hawkbit.dev.example.com; + server_tokens off; + + location /.well-known/acme-challenge/ { + root /var/www/certbot; + } + + location / { + return 301 https://hawkbit.dev.example.com$request_uri; + } +} + +server { + listen 443 ssl; + listen [::]:443 ssl; + + server_name hawkbit.dev.example.com; + + ssl_certificate /etc/nginx/ssl/live/hawkbit.dev.example.com/server.crt; + ssl_certificate_key /etc/nginx/ssl/live/hawkbit.dev.example.com/server.key; + + ssl_client_certificate /etc/nginx/client-cer/client_ca.crt; + ssl_verify_client optional; + ssl_verify_depth 3; + + + # For devices that is using device integration API, + # Mutual TLS is required. + location ~*/.*/controller/ { + if ($ssl_client_verify != SUCCESS) { + return 403; + } + + proxy_pass http://hawkbit.dev.example.com:8080; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + + # Client certificate Common Name and Issuer Hash is required + # for auth in hawkbit. + proxy_set_header X-Ssl-Client-Cn $ssl_client_s_dn_cn; + proxy_set_header X-Ssl-Issuer-Hash-1 Hawkbit; + + # These are required for clients to upload and download software. + proxy_request_buffering off; + client_max_body_size 1000m; + } + + # For clients that is using UI or Management API + location / { + proxy_pass http://hawkbit.dev.example.com:8080; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_request_buffering off; + client_max_body_size 1000m; + } +} +``` + +4. To deploy Nginx, you could use a `.yml` file. Here's an example `docker-compose.yml` file for Nginx Docker. + +```yml +version: '3' + +services: + webserver: + image: nginx:latest + ports: + - 80:80 + - 443:443 + restart: always + volumes: + - ./nginx/conf/:/etc/nginx/conf.d/:ro + - ./certbot/www:/var/www/certbot/:ro + - ./certbot/conf/:/etc/nginx/ssl/:ro + - ./client-cer/:/etc/nginx/client-cer/ + - ./landing-page/:/etc/webserver/landing-page + certbot: + image: certbot/certbot:latest + volumes: + - ./certbot/www/:/var/www/certbot/:rw + - ./certbot/conf/:/etc/letsencrypt/:rw +``` +`/client-cer/:/etc/nginx/client-cer/` is the designated location for the certificate authority that has signed the client certificate. The presented client certificate will be verified against this CA. + +5. After successfully generating your certificates with the correct chain, deploying your Nginx and Hawkbit services with appropriate configurations, and updating the settings on the device side, you will be able to establish a certificate-based authentication mechanism. This will eliminate the necessity of sharing a security token with the server. + +  +##### Swupdate Suricatta Configurations + +If the client is utilizing the SWUpdate Suricatta service, the configurations on the device or client side should also be adjusted as follows. Remember to change id, url and certificate names to your needs. + +The location of the config file is `/etc/swupdate/swupdate.conf` + +```yml +suricatta : +{ +tenant = "default"; +id = "device_id"; +url = "https://hawkbit.dev.example.com"; +nocheckcert = false; +cafile = "server_ca.crt"; +sslkey = "/etc/ssl/certs/client.key"; +sslcert = "/etc/ssl/certs/client.crt"; +}; +``` + +If your client service is a linux, you can use the command bellow to see the logs produced by the swupdate. + +```shell +journalctl --follow -u swupdate +``` + +  +##### Testing + +You can test the communication by using the Curl command below to see if you successfully implemented mutual TLS: + +```shell +curl -L -v --cert client.crt --key client.key --cacert server_ca.crt https://hawkbit.dev.example.com/default/controller/v1/{device-id} +``` + +In the UI, after uploading an SWU package and requesting a firmware update, you can use the link below to attempt to install the software package. + +``` +curl -L -v --cert client.crt --key client.key --cacert server_ca.crt https://hawkbit.dev.example.com/default/controller/v1/{device-id}/softwaremodules/{artifact-id}/artifacts/hawkbit_updated_5.swu --output outputfile +``` + ## DMF API Authentication is provided by _RabbitMQ_ [vhost and user credentials](https://www.rabbitmq.com/access-control.html) that is used for the integration. diff --git a/docs/content/concepts/authorization.md b/docs/content/concepts/authorization.md index cce7c214f1..e1aa7434b8 100644 --- a/docs/content/concepts/authorization.md +++ b/docs/content/concepts/authorization.md @@ -50,13 +50,11 @@ hawkbit supports authentication providers which use the OpenID Connect standard, An example configuration is given below. spring.security.oauth2.client.registration.oidc.client-id=clientID - spring.security.oauth2.client.registration.oidc.client-secret=oidc-client-secret spring.security.oauth2.client.provider.oidc.issuer-uri=https://oidc-provider/issuer-uri - spring.security.oauth2.client.provider.oidc.authorization-uri=https://oidc-provider/authorization-uri - spring.security.oauth2.client.provider.oidc.token-uri=https://oidc-provider/token-uri - spring.security.oauth2.client.provider.oidc.user-info-uri=https://oidc-provider/user-info-uri spring.security.oauth2.client.provider.oidc.jwk-set-uri=https://oidc-provider/jwk-set-uri +Note: at the moment only DEFAULT tenant is supported. By default the resource_access//roles claim is mapped to hawkBit permissions. However, by registering a Spring bean _org.eclipse.hawkbit.autoconfigure.security.OidcUserManagementAutoConfiguration.JwtAuthoritiesExtractor_ a custom extractor permission mapper could be registered. + ### Delivered Permissions - READ_/UPDATE_/CREATE_/DELETE_TARGET for: diff --git a/docs/content/news/2023-09-21-epl2.0.md b/docs/content/news/2023-09-21-epl2.0.md new file mode 100644 index 0000000000..8bd0f53c94 --- /dev/null +++ b/docs/content/news/2023-09-21-epl2.0.md @@ -0,0 +1,19 @@ +--- +title: Eclipse hawkBit upgrade to Eclipse Public License - v 2.0 +weight: -200 +--- + +hawkBit is a domain-independent back-end framework for rolling out software updates to constrained edge devices as well +as more powerful controllers and gateways connected to IP based networking infrastructure. It is part of the Eclipse IoT +since 2015. + +In this article, we want to give an overview of the latest highlights of hawkBit license changes. + +## hawkBit license upgraded to Eclipse Public License - v 2.0 + +Based on the issues +[Switch to EPL 2.0 License](https://github.com/eclipse/hawkbit/issues/1393) and +[Update hawkBit's license to EPL 2.0](https://github.com/eclipse/hawkbit/issues/1008) +the hawkBit license is upgraded from [Eclipse Public License - Version 1.0](http://www.eclipse.org/org/documents/epl-v10.php) to +[Eclipse Public License - v 2.0](https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt). + diff --git a/docs/install-theme.bat b/docs/install-theme.bat index fe2444bef7..3760bacb2b 100644 --- a/docs/install-theme.bat +++ b/docs/install-theme.bat @@ -1,15 +1,15 @@ @echo off @REM -@REM Copyright (c) 2018 Bosch Software Innovations GmbH and others. +@REM Copyright (c) 2023 Bosch.IO GmbH and others @REM -@REM All rights reserved. This program and the accompanying materials -@REM are made available under the terms of the Eclipse Public License v1.0 -@REM which accompanies this distribution, and is available at -@REM http://www.eclipse.org/legal/epl-v10.html +@REM This program and the accompanying materials are made +@REM available under the terms of the Eclipse Public License 2.0 +@REM which is available at https://www.eclipse.org/legal/epl-2.0/ +@REM +@REM SPDX-License-Identifier: EPL-2.0 @REM rem This script checks if 'hugo' is installed. Afterwards, the Hugo theme is downloaded. - hugo version if ERRORLEVEL 1 ( echo [ERROR] Please install Hugo first before proceeding. @@ -19,12 +19,22 @@ if ERRORLEVEL 1 ( echo [INFO] echo [INFO] Install Hugo Theme set HUGO_THEMES=themes\hugo-material-docs +set CSS_FILE=themes\hugo-material-docs\static\stylesheets\application.css if not exist %HUGO_THEMES%\ ( git submodule add --force https://github.com/digitalcraftsman/hugo-material-docs.git %HUGO_THEMES% echo [INFO] ... done ) else echo [INFO] ... theme already installed in: %HUGO_THEMES% +rem This script uses 'awk' to replace 1200px with 1500px in the application.css file from 'hugo' +if exist %CSS_FILE% ( +then + powershell -Command "(gc %CSS_FILE%) -replace 'max-width:1200px', 'max-width:1500px' | Out-File -encoding ASCII %CSS_FILE%" + echo [INFO] CSS updated content successfully! +else + echo [WARN] CSS file not found! +fi + echo [INFO] echo [INFO] Launch the documentation locally by running 'mvn site' (or 'hugo server' in the docs directory), -echo [INFO] and browse to 'http://localhost:1313/hawkbit/'. \ No newline at end of file +echo [INFO] and browse to 'http://localhost:{port}/hawkbit/'. \ No newline at end of file diff --git a/docs/install-theme.sh b/docs/install-theme.sh index f59387f62f..3eee718e8d 100755 --- a/docs/install-theme.sh +++ b/docs/install-theme.sh @@ -1,17 +1,16 @@ # -# Copyright (c) 2018 Bosch Software Innovations GmbH and others. +# Copyright (c) 2018 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # - -# This script checks if 'hugo' is installed. Afterwards, the Hugo theme is downloaded. #!/bin/bash - +# This script checks if 'hugo' is installed. Afterwards, the Hugo theme is downloaded. hugo version if [ $? != 0 ] then @@ -22,6 +21,7 @@ fi echo "[INFO] " echo "[INFO] Install Hugo Theme" HUGO_THEMES=themes/hugo-material-docs +CSS_FILE=themes/hugo-material-docs/static/stylesheets/application.css if [ ! -d ${HUGO_THEMES} ] then @@ -31,6 +31,15 @@ else echo "[INFO] ... theme already installed in: ${HUGO_THEMES}" fi +# This script uses 'awk' to replace 1200px with 1500px in the application.css file from 'hugo' +if [ -f ${CSS_FILE} ] +then + awk '{gsub(/max-width:1200px/, "max-width:1500px"); print}' "${CSS_FILE}" > tmp_hawkbit_doc && mv tmp_hawkbit_doc "${CSS_FILE}" + echo "[INFO] CSS updated content successfully!" +else + echo "[WARN] CSS file not found!" +fi + echo "[INFO] " echo "[INFO] Launch the documentation locally by running 'mvn site' (or 'hugo server' in the docs directory)," echo "[INFO] and browse to 'http://localhost:1313/hawkbit/'. " \ No newline at end of file diff --git a/docs/layouts/partials/copyright.html b/docs/layouts/partials/copyright.html index fafdda3341..17aa964b2b 100755 --- a/docs/layouts/partials/copyright.html +++ b/docs/layouts/partials/copyright.html @@ -26,7 +26,7 @@ > Legal - + > License

diff --git a/docs/pom.xml b/docs/pom.xml index 5029f63923..a4f17816dc 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -1,11 +1,12 @@ @@ -60,21 +61,32 @@ maven-dependency-plugin - unpack-api-docs + copy-openapi prepare-package - unpack + copy org.eclipse.hawkbit - hawkbit-rest-docs + hawkbit-update-server + ${project.version} + mgmt-openapi + yaml + true + ${basedir}/content/rest-api + mgmt.yaml + + + org.eclipse.hawkbit + hawkbit-update-server ${project.version} - jar + ddi-openapi + yaml true - ${basedir}/content/ - **/*.html + ${basedir}/content/rest-api + ddi.yaml @@ -86,6 +98,21 @@ exec-maven-plugin ${exec-maven-plugin.version} + + build-htmls + + exec + + install + + ${shell} + ${project.basedir} + + ${shell.option} + build-htmls.${batch.ext} + + + install-hugo-theme diff --git a/docs/static/images/security/exampleReverseProxyArchitecture.png b/docs/static/images/security/exampleReverseProxyArchitecture.png new file mode 100644 index 0000000000..dec5e6f302 Binary files /dev/null and b/docs/static/images/security/exampleReverseProxyArchitecture.png differ diff --git a/docs/static/images/security/exampleReverseProxySettings.png b/docs/static/images/security/exampleReverseProxySettings.png new file mode 100644 index 0000000000..482630465b Binary files /dev/null and b/docs/static/images/security/exampleReverseProxySettings.png differ diff --git a/docs/static/news/2018-07-26-first-release.html b/docs/static/news/2018-07-26-first-release.html deleted file mode 100644 index 097c508a72..0000000000 --- a/docs/static/news/2018-07-26-first-release.html +++ /dev/null @@ -1,653 +0,0 @@ - - - - - - - - - - - - Eclipse hawkBit 0.2.0 - First Release - Eclipse hawkBit - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - - - - -
- -
- -
-
- - -
- -
-
-

Eclipse hawkBit 0.2.0 - First Release

- - - -

hawkBit is a domain-independent back-end framework for rolling out software updates to constrained edge devices as well -as more powerful controllers and gateways connected to IP based networking infrastructure. It is part of the Eclipse IoT -since 2015 and with version 0.2.0 a first release is available.

- -

In this article, we want to give an overview of the latest highlights of hawkBit and let you know how you can get -started in seconds.

- -

Finally, it is here!

- -

After being around in the Eclipse IoT realm for quite some time now, we are more than happy to announce our first release: -Eclipse hawkBit 0.2.0. The release can be found on Maven Central -and Docker Hub. It includes the following core features:

- -
    -
  • Device and Software Repository
    • -
  • Update Management
    • -
  • Artifact Content Delivery
    • -
  • Rollout Management
    • -
- -

The features are accessible via the following interfaces:

- -
    -
  • Management UI
    • -
  • Management API
    • -
  • Direct Device Integration (DDI) API
    • -
  • Device Management Federation (DMF) API
    • -
- -

hawkBit Overview

- -

What’s new?

- -

Whenever there is a new release, the first question that comes to mind is: What’s new? Since this is our first release, -one could argue that everything is new. However, most of the features are already well-established. This holds true, for -example, for our APIs or the Rollout Management. Nevertheless, there have been some recent updates to hawkBit, which we -do not want to leave unmentioned:

- -

Streamlined UI

- -

The probably most noticeable change has been the removal of the two buttons (Drop here to delete and Actions) at the -bottom of the Deployment, Distributions, and Upload view. This is a major usability improvement! For example, -deleting an item required (1) dragging an item onto the delete button, (2) opening the delete pop-up, and (3) confirming -the deletion. Now, an item can be easily removed by clicking on its remove icon and confirming the action. Moreover, -multiple (or all CTRL + A) items can be selected and removed at once using the same mechanism. This is not only -faster and more intuitive, it also saves a lot of display real estate which can now be used to focus on what is important. -We hope you like this change as much as we do! (Requires: hawkBit > 0.2.2)

- -

Screenshot of improved UI

- -

MS SQL Server

- -

Eclipse hawkBit supports a range of different SQL databases. Up to now, these have been the internal H2 database (which can be -used for testing, development, or trial) and MySQL/MariaDB for production-grade usage. This list is now extended by -Microsoft’s SQL Server which is also available in production grade, as well as, IBM’s DB2 for testing and development.

- -

Open Sourced REST docs

- -

A huge benefit for the community is the recently open sourced REST docs of hawkBit. This has been an open request -for some time, which we were happy to meet. The documentation is generated using Spring REST docs, based on unit-tests. These tests, with the respective documentation, are now available in the code base. - Furthermore, the API documentation will be hosted on our new website (coming soon).

- -

Docker Images

- -

In order to enable interested parties to get started with hawkBit conveniently, we decided to provide the -Update Server as a Docker image on Docker Hub. The image comes -in two flavors: The default image uses the internal H2 database, while the images with a -mysql suffix contain the MySQL -driver to allow connecting a MySQL database. In addition to the Docker image, the hawkBit repository contains a -docker-compose.yml -that not only starts the Update Server, but further includes a MySQL database and a RabbitMQ message broker so you’re -able to use Device Management Federation (DMF) as well.

- -

To start the hawkBit Update Server image, open a terminal and run:

- -
$ docker run -d -p 8080:8080 hawkbit/hawkbit-update-server
-
- -
-

-

Note: This requires a running Docker deamon on your system.

-
- -

Now, browse to http://localhost:8080 and log-in with admin:admin. There you go!

- -

Community Updates

- -

Although features and functionality play a major role in the hawkBit project, there is also some interesting news from -the community. As of July 2018, there have been:

- -
    -
  • Pull Requests: 587
    • -
  • Forks: 54
    • -
  • Stars: 137
    • -
  • Contributors: 25
    • -
  • Gitter Chat members: 119
    • -
- -

New Project Lead and Committers

- -

We are happy to announce that the hawkBit project got a new project lead. In addition to -Kai Zimmermann, project lead from the first hour, -Jeroen Laverman joined the lead to support him in this responsibility. -Moreover, with Stefan Behl and Jeroen Laverman, two new committers are aboard.

- -

What’s next?

- -

Looking ahead, there are two major topics that we want to tackle next: First, there is the migration of our UI from Vaadin -7 to Vaadin 8, since Vaadin announced the end-of-life for our current version. Another big topic will be the update -to Spring Boot 2. On the community side, we are in the final stage of updating our website -with a new design, so make sure you stop by in a couple of days to check it out. Finally, the hawkBit team will be -present at EclipseCon Europe 2018, so if you are interested in meeting us, that is the place to be.

- - - - - - -
-
- -
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - diff --git a/docs/static/slides/community-day-2019.html b/docs/static/slides/community-day-2019.html index df3356f59d..4dc1080c26 100644 --- a/docs/static/slides/community-day-2019.html +++ b/docs/static/slides/community-day-2019.html @@ -1,10 +1,11 @@ diff --git a/docs/static/slides/community-day-2020.html b/docs/static/slides/community-day-2020.html index 408fc9d32d..752ae1f10d 100644 --- a/docs/static/slides/community-day-2020.html +++ b/docs/static/slides/community-day-2020.html @@ -1,10 +1,11 @@ diff --git a/hawkbit-artifact-repository-filesystem/pom.xml b/hawkbit-artifact-repository-filesystem/pom.xml index fb73316a40..19385b2ab1 100644 --- a/hawkbit-artifact-repository-filesystem/pom.xml +++ b/hawkbit-artifact-repository-filesystem/pom.xml @@ -1,11 +1,12 @@ diff --git a/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFileNotFoundException.java b/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFileNotFoundException.java index e4ceaa5b64..92e92a76ec 100644 --- a/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFileNotFoundException.java +++ b/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFileNotFoundException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.artifact.repository; diff --git a/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystem.java b/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystem.java index 9e9b760c14..147d3c26de 100644 --- a/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystem.java +++ b/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.artifact.repository; diff --git a/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemConfiguration.java b/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemConfiguration.java index bd4dd90f67..5b57f1d384 100644 --- a/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemConfiguration.java +++ b/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.artifact.repository; diff --git a/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemProperties.java b/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemProperties.java index 1d19cd36f0..31e3cbd39d 100644 --- a/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemProperties.java +++ b/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemProperties.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.artifact.repository; diff --git a/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepository.java b/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepository.java index 90e9b12b0d..7f83396821 100644 --- a/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepository.java +++ b/hawkbit-artifact-repository-filesystem/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.artifact.repository; diff --git a/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java b/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java index 4118c553a1..616e22e4a7 100644 --- a/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java +++ b/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemRepositoryTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.artifact.repository; diff --git a/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemTest.java b/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemTest.java index 46bd1b1f73..cccfbd2262 100644 --- a/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemTest.java +++ b/hawkbit-artifact-repository-filesystem/src/test/java/org/eclipse/hawkbit/artifact/repository/ArtifactFilesystemTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.artifact.repository; @@ -13,6 +14,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.nio.file.Files; import org.apache.commons.io.IOUtils; import org.assertj.core.api.Assertions; @@ -45,7 +47,7 @@ public void getInputStreamOfNonExistingFileThrowsException() { @Test @Description("Verifies that an InputStream can be opened if file exists") public void getInputStreamOfExistingFile() throws IOException { - final File createTempFile = File.createTempFile(ArtifactFilesystemTest.class.getSimpleName(), ""); + final File createTempFile = Files.createTempFile(ArtifactFilesystemTest.class.getSimpleName(), "").toFile(); createTempFile.deleteOnExit(); final ArtifactFilesystem underTest = new ArtifactFilesystem(createTempFile, diff --git a/hawkbit-autoconfigure/pom.xml b/hawkbit-autoconfigure/pom.xml index c8754797e9..c2f028700d 100644 --- a/hawkbit-autoconfigure/pom.xml +++ b/hawkbit-autoconfigure/pom.xml @@ -1,11 +1,12 @@ @@ -94,6 +95,10 @@ javax.servlet-api provided + + org.springframework.boot + spring-boot-starter-actuator + org.springframework.boot spring-boot-actuator diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/PropertyHostnameResolverAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/PropertyHostnameResolverAutoConfiguration.java index 05f92a3264..1710d872a0 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/PropertyHostnameResolverAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/PropertyHostnameResolverAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure; @@ -16,6 +17,7 @@ import org.eclipse.hawkbit.api.ArtifactUrlHandlerProperties; import org.eclipse.hawkbit.api.HostnameResolver; import org.eclipse.hawkbit.api.PropertyBasedArtifactUrlHandler; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -57,8 +59,9 @@ HostnameResolver hostnameResolver(final HawkbitServerProperties serverProperties @Bean @ConditionalOnMissingBean(ArtifactUrlHandler.class) PropertyBasedArtifactUrlHandler propertyBasedArtifactUrlHandler( - final ArtifactUrlHandlerProperties urlHandlerProperties) { - return new PropertyBasedArtifactUrlHandler(urlHandlerProperties); + final ArtifactUrlHandlerProperties urlHandlerProperties, + @Value("${server.servlet.context-path:}") final String contextPath) { + return new PropertyBasedArtifactUrlHandler(urlHandlerProperties, contextPath); } } diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/CacheAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/CacheAutoConfiguration.java index 4f371792d0..6f14a1d507 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/CacheAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/CacheAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.cache; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/CacheProperties.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/CacheProperties.java index b9eab10de3..5227a353fa 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/CacheProperties.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/CacheProperties.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.cache; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/DownloadIdCacheAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/DownloadIdCacheAutoConfiguration.java index 55000fc360..fb9bd6f75f 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/DownloadIdCacheAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/cache/DownloadIdCacheAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.cache; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/ddi/DDiApiAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/ddi/DDiApiAutoConfiguration.java index d4597be2b3..ddc929fae0 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/ddi/DDiApiAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/ddi/DDiApiAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.ddi; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/dmf/amqp/DmfApiAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/dmf/amqp/DmfApiAutoConfiguration.java index a6610db31e..8aa6b17ecc 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/dmf/amqp/DmfApiAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/dmf/amqp/DmfApiAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.dmf.amqp; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/mgmt/MgmtApiAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/mgmt/MgmtApiAutoConfiguration.java index a8c4c5778f..7ae06452b1 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/mgmt/MgmtApiAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/mgmt/MgmtApiAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.mgmt; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/repository/ArtifactFilesystemAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/repository/ArtifactFilesystemAutoConfiguration.java index 2ff5d61cd4..f6473b817e 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/repository/ArtifactFilesystemAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/repository/ArtifactFilesystemAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.repository; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/repository/JpaRepositoryAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/repository/JpaRepositoryAutoConfiguration.java index 0671a0d349..f1b64e0ca4 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/repository/JpaRepositoryAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/repository/JpaRepositoryAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.repository; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/repository/event/EventPublisherAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/repository/event/EventPublisherAutoConfiguration.java index 39370b937f..244408d85e 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/repository/event/EventPublisherAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/repository/event/EventPublisherAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.repository.event; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/scheduling/AsyncConfigurerAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/scheduling/AsyncConfigurerAutoConfiguration.java index eebfac6b0f..944a6efe77 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/scheduling/AsyncConfigurerAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/scheduling/AsyncConfigurerAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.scheduling; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/scheduling/AsyncConfigurerThreadpoolProperties.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/scheduling/AsyncConfigurerThreadpoolProperties.java index d6f3ca430e..995247275e 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/scheduling/AsyncConfigurerThreadpoolProperties.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/scheduling/AsyncConfigurerThreadpoolProperties.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.scheduling; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/scheduling/ExecutorAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/scheduling/ExecutorAutoConfiguration.java index 917e4e4ef8..3109a2888c 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/scheduling/ExecutorAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/scheduling/ExecutorAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.scheduling; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/EnableHawkbitManagedSecurityConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/EnableHawkbitManagedSecurityConfiguration.java index ad8b48dc3a..045fec328e 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/EnableHawkbitManagedSecurityConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/EnableHawkbitManagedSecurityConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.security; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/InMemoryUserManagementAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/InMemoryUserManagementAutoConfiguration.java index 0797e31e7c..4b4fca00c2 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/InMemoryUserManagementAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/InMemoryUserManagementAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.security; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/MultiUserProperties.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/MultiUserProperties.java index d046e09741..1912e8b92d 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/MultiUserProperties.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/MultiUserProperties.java @@ -1,10 +1,11 @@ /** * Copyright (c) 2019 devolo GmbH and others. * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.security; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/OidcUserManagementAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/OidcUserManagementAutoConfiguration.java index 463ba48fe3..d532fc6a63 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/OidcUserManagementAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/OidcUserManagementAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Kiwigrid GmbH and others. + * Copyright (c) 2019 Kiwigrid GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.security; @@ -28,7 +29,6 @@ import org.eclipse.hawkbit.im.authentication.UserAuthenticationFilter; import org.eclipse.hawkbit.repository.SystemManagement; import org.eclipse.hawkbit.security.SystemSecurityContext; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.security.oauth2.client.ClientsConfiguredCondition; import org.springframework.context.annotation.Bean; @@ -46,6 +46,7 @@ import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.userinfo.OAuth2UserService; +import org.springframework.security.oauth2.core.OAuth2AccessToken; import org.springframework.security.oauth2.core.OAuth2AuthenticationException; import org.springframework.security.oauth2.core.OAuth2Error; import org.springframework.security.oauth2.core.OAuth2ErrorCodes; @@ -79,14 +80,12 @@ public class OidcUserManagementAutoConfiguration { /** - * @return the oauth2 user details service to load a user from oidc user - * manager + * @return the OpenID Connect authentication success handler */ @Bean - @ConditionalOnMissingBean - public OAuth2UserService oidcUserDetailsService( - final JwtAuthoritiesExtractor extractor) { - return new JwtAuthoritiesOidcUserService(extractor); + public AuthenticationSuccessHandler oidcAuthenticationSuccessHandler( + final SystemManagement systemManagement, final SystemSecurityContext systemSecurityContext) { + return new OidcAuthenticationSuccessHandler(systemManagement, systemSecurityContext); } /** @@ -97,14 +96,6 @@ public LogoutSuccessHandler oidcLogoutSuccessHandler() { return new OidcLogoutSuccessHandler(); } - /** - * @return the OpenID Connect authentication success handler - */ - @Bean - public AuthenticationSuccessHandler oidcAuthenticationSuccessHandler() { - return new OidcAuthenticationSuccessHandler(); - } - /** * @return the OpenID Connect logout handler */ @@ -115,7 +106,7 @@ public LogoutHandler oidcLogoutHandler() { /** * @return a jwt authorities extractor which interprets the roles of a user - * as their authorities. + * as their authorities. */ @Bean @ConditionalOnMissingBean @@ -124,241 +115,258 @@ public JwtAuthoritiesExtractor jwtAuthoritiesExtractor() { authorityMapper.setPrefix(""); authorityMapper.setConvertToUpperCase(true); - return new JwtAuthoritiesExtractor(authorityMapper); + return new DefaultJwtAuthoritiesExtractor(authorityMapper); } /** - * @return an authentication filter for using OAuth2 Bearer Tokens. + * @return the oauth2 user details service to load a user from oidc user manager */ @Bean @ConditionalOnMissingBean - public OidcBearerTokenAuthenticationFilter oidcBearerTokenAuthenticationFilter() { - return new OidcBearerTokenAuthenticationFilter(); + OAuth2UserService oidcUserDetailsService( + final JwtAuthoritiesExtractor extractor) { + return new JwtAuthoritiesOidcUserService(extractor); } -} - -/** - * Extended {@link OidcUserService} supporting JWT containing authorities - */ -class JwtAuthoritiesOidcUserService extends OidcUserService { - private final JwtAuthoritiesExtractor authoritiesExtractor; + /** + * @return an authentication filter for using OAuth2 Bearer Tokens. + */ + @Bean + @ConditionalOnMissingBean + OidcBearerTokenAuthenticationFilter oidcBearerTokenAuthenticationFilter( + final JwtAuthoritiesExtractor authoritiesExtractor, + final SystemManagement systemManagement, final SystemSecurityContext systemSecurityContext) { + return new OidcBearerTokenAuthenticationFilter( + authoritiesExtractor, systemManagement, systemSecurityContext); + } - JwtAuthoritiesOidcUserService(final JwtAuthoritiesExtractor authoritiesExtractor) { - super(); + /** + * By registering bean of such type hawkBit could be customized to extract authorities from the token. + */ + public interface JwtAuthoritiesExtractor { - this.authoritiesExtractor = authoritiesExtractor; + Set extract(final Jwt token, final ClientRegistration clientRegistration ); } - @Override - public OidcUser loadUser(final OidcUserRequest userRequest) { - final OidcUser user = super.loadUser(userRequest); - final ClientRegistration clientRegistration = userRequest.getClientRegistration(); + /** + * Extended {@link OidcUserService} supporting JWT containing authorities + */ + private static class JwtAuthoritiesOidcUserService extends OidcUserService { + + private final JwtAuthoritiesExtractor authoritiesExtractor; - final Set authorities = authoritiesExtractor.extract(clientRegistration, - userRequest.getAccessToken().getTokenValue()); - if (authorities.isEmpty()) { - return user; + JwtAuthoritiesOidcUserService(final JwtAuthoritiesExtractor authoritiesExtractor) { + this.authoritiesExtractor = authoritiesExtractor; } - final String userNameAttributeName = clientRegistration.getProviderDetails().getUserInfoEndpoint() - .getUserNameAttributeName(); - OidcUser oidcUser; - if (StringUtils.hasText(userNameAttributeName)) { - oidcUser = new DefaultOidcUser(authorities, userRequest.getIdToken(), user.getUserInfo(), - userNameAttributeName); - } else { - oidcUser = new DefaultOidcUser(authorities, userRequest.getIdToken(), user.getUserInfo()); + @Override + public OidcUser loadUser(final OidcUserRequest userRequest) { + final OidcUser user = super.loadUser(userRequest); + final ClientRegistration clientRegistration = userRequest.getClientRegistration(); + + // Token is already verified by spring security + final NimbusJwtDecoder jwtDecoder = + NimbusJwtDecoder + .withJwkSetUri(clientRegistration.getProviderDetails().getJwkSetUri()) + .jwsAlgorithm(SignatureAlgorithm.from(JwsAlgorithms.RS256)) + .build(); + final Jwt token = jwtDecoder.decode(userRequest.getAccessToken().getTokenValue()); + final Set authorities = authoritiesExtractor.extract(token, clientRegistration); + if (authorities.isEmpty()) { + return user; + } + + final String userNameAttributeName = clientRegistration.getProviderDetails().getUserInfoEndpoint() + .getUserNameAttributeName(); + final OidcUser oidcUser; + if (StringUtils.hasText(userNameAttributeName)) { + oidcUser = new DefaultOidcUser(authorities, userRequest.getIdToken(), user.getUserInfo(), + userNameAttributeName); + } else { + oidcUser = new DefaultOidcUser(authorities, userRequest.getIdToken(), user.getUserInfo()); + } + return oidcUser; } - return oidcUser; } -} -/** - * OpenID Connect Authentication Success Handler which load tenant data - */ -class OidcAuthenticationSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler { + /** + * OpenID Connect Authentication Success Handler which load tenant data + */ + private static class OidcAuthenticationSuccessHandler extends SavedRequestAwareAuthenticationSuccessHandler { - @Autowired - private SystemManagement systemManagement; + private final SystemManagement systemManagement; + private final SystemSecurityContext systemSecurityContext; - @Autowired - private SystemSecurityContext systemSecurityContext; + OidcAuthenticationSuccessHandler( + final SystemManagement systemManagement, final SystemSecurityContext systemSecurityContext) { + this.systemManagement = systemManagement; + this.systemSecurityContext = systemSecurityContext; + } - @Override - public void onAuthenticationSuccess(final HttpServletRequest request, final HttpServletResponse response, - final Authentication authentication) throws ServletException, IOException { - if (authentication instanceof AbstractAuthenticationToken) { - final String defaultTenant = "DEFAULT"; + @Override + public void onAuthenticationSuccess( + final HttpServletRequest request, final HttpServletResponse response, + final Authentication authentication) throws ServletException, IOException { + if (authentication instanceof AbstractAuthenticationToken token) { + final String defaultTenant = "DEFAULT"; - final AbstractAuthenticationToken token = (AbstractAuthenticationToken) authentication; - token.setDetails(new TenantAwareAuthenticationDetails(defaultTenant, false)); + token.setDetails(new TenantAwareAuthenticationDetails(defaultTenant, false)); - systemSecurityContext.runAsSystemAsTenant(systemManagement::getTenantMetadata, defaultTenant); - } + systemSecurityContext.runAsSystemAsTenant(systemManagement::getTenantMetadata, defaultTenant); + } - super.onAuthenticationSuccess(request, response, authentication); + super.onAuthenticationSuccess(request, response, authentication); + } } -} -/** - * LogoutHandler to invalidate OpenID Connect tokens - */ -class OidcLogoutHandler extends SecurityContextLogoutHandler { + /** + * LogoutHandler to invalidate OpenID Connect tokens + */ + private static class OidcLogoutHandler extends SecurityContextLogoutHandler { - @Override - public void logout(final HttpServletRequest request, final HttpServletResponse response, - final Authentication authentication) { - super.logout(request, response, authentication); + @Override + public void logout(final HttpServletRequest request, final HttpServletResponse response, + final Authentication authentication) { + super.logout(request, response, authentication); - final Object principal = authentication.getPrincipal(); - if (principal instanceof OidcUser) { - final OidcUser user = (OidcUser) authentication.getPrincipal(); - final String endSessionEndpoint = user.getIssuer() + "/protocol/openid-connect/logout"; + final Object principal = authentication.getPrincipal(); + if (principal instanceof OidcUser) { + final OidcUser user = (OidcUser) authentication.getPrincipal(); + final String endSessionEndpoint = user.getIssuer() + "/protocol/openid-connect/logout"; - final UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(endSessionEndpoint) - .queryParam("id_token_hint", user.getIdToken().getTokenValue()); + final UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(endSessionEndpoint) + .queryParam("id_token_hint", user.getIdToken().getTokenValue()); - final RestTemplate restTemplate = new RestTemplate(); - restTemplate.getForEntity(builder.toUriString(), String.class); + final RestTemplate restTemplate = new RestTemplate(); + restTemplate.getForEntity(builder.toUriString(), String.class); + } } } -} -/** - * LogoutSuccessHandler that decides where to redirect to after logout, depending on - * the previously used auth mechanism - */ -class OidcLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler { - - @Override - public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) - throws IOException, ServletException { - if (authentication instanceof OAuth2AuthenticationToken) { - this.setTargetUrlParameter("/"); - } else { - this.setTargetUrlParameter("login"); + /** + * LogoutSuccessHandler that decides where to redirect to after logout, depending on + * the previously used auth mechanism + */ + private static class OidcLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler { + + @Override + public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) + throws IOException, ServletException { + if (authentication instanceof OAuth2AuthenticationToken) { + this.setTargetUrlParameter("/"); + } else { + this.setTargetUrlParameter("login"); + } + super.onLogoutSuccess(request, response, authentication); } - super.onLogoutSuccess(request, response, authentication); } -} -/** - * Utility class to extract authorities out of the jwt. It interprets the user's - * role as their authorities. - */ -class JwtAuthoritiesExtractor { - - private final GrantedAuthoritiesMapper authoritiesMapper; - - private static final OAuth2Error INVALID_REQUEST = new OAuth2Error(OAuth2ErrorCodes.INVALID_REQUEST); - - JwtAuthoritiesExtractor(final GrantedAuthoritiesMapper authoritiesMapper) { - super(); + /** + * Utility class to extract authorities out of the jwt. It interprets the user's + * role as their authorities. + */ + private record DefaultJwtAuthoritiesExtractor + (GrantedAuthoritiesMapper authoritiesMapper) implements JwtAuthoritiesExtractor { - this.authoritiesMapper = authoritiesMapper; - } + private static final OAuth2Error INVALID_REQUEST = new OAuth2Error(OAuth2ErrorCodes.INVALID_REQUEST); - Set extract(final ClientRegistration clientRegistration, final String tokenValue) { - try { - // Token is already verified by spring security - final NimbusJwtDecoder jwtDecoder = - NimbusJwtDecoder - .withJwkSetUri(clientRegistration.getProviderDetails().getJwkSetUri()) - .jwsAlgorithm(SignatureAlgorithm.from(JwsAlgorithms.RS256)) - .build(); - final Jwt token = jwtDecoder.decode(tokenValue); - - return extract(clientRegistration.getClientId(), token.getClaims()); - } catch (final JwtException e) { - throw new OAuth2AuthenticationException(INVALID_REQUEST, e); + @Override + public Set extract(final Jwt token, final ClientRegistration clientRegistration) { + try { + return extract(clientRegistration.getClientId(), token.getClaims()); + } catch (final JwtException e) { + throw new OAuth2AuthenticationException(INVALID_REQUEST, e); + } } - } - @SuppressWarnings("unchecked") - Set extract(final String clientId, final Map claims) { - final Map resourceMap = (Map) claims.get("resource_access"); + @SuppressWarnings("unchecked") + private Set extract(final String clientId, final Map claims) { + final Map resourceMap = (Map) claims.get("resource_access"); + if (CollectionUtils.isEmpty(resourceMap)) { + return Collections.emptySet(); + } - final Map> clientResource = (Map>) resourceMap - .get(clientId); - if (CollectionUtils.isEmpty(clientResource)) { - return Collections.emptySet(); - } + final Map> clientResource = (Map>) resourceMap + .get(clientId); + if (CollectionUtils.isEmpty(clientResource)) { + return Collections.emptySet(); + } - final List roles = (List) clientResource.get("roles"); - if (CollectionUtils.isEmpty(roles)) { - return Collections.emptySet(); - } + final List roles = (List) clientResource.get("roles"); + if (CollectionUtils.isEmpty(roles)) { + return Collections.emptySet(); + } - final List authorities = AuthorityUtils.createAuthorityList(roles.toArray(new String[0])); - if (authoritiesMapper != null) { - return new LinkedHashSet<>(authoritiesMapper.mapAuthorities(authorities)); - } + final List authorities = AuthorityUtils.createAuthorityList(roles.toArray(new String[0])); + if (authoritiesMapper != null) { + return new LinkedHashSet<>(authoritiesMapper.mapAuthorities(authorities)); + } - return new LinkedHashSet<>(authorities); + return new LinkedHashSet<>(authorities); + } } -} - -class OidcBearerTokenAuthenticationFilter implements UserAuthenticationFilter, Filter { - @Autowired - private JwtAuthoritiesExtractor authoritiesExtractor; + static class OidcBearerTokenAuthenticationFilter implements UserAuthenticationFilter, Filter { - @Autowired - private SystemManagement systemManagement; + private final JwtAuthoritiesExtractor authoritiesExtractor; + private final SystemManagement systemManagement; + private final SystemSecurityContext systemSecurityContext; - @Autowired - private SystemSecurityContext systemSecurityContext; + private ClientRegistration clientRegistration; - private ClientRegistration clientRegistration; + OidcBearerTokenAuthenticationFilter( + final JwtAuthoritiesExtractor authoritiesExtractor, + final SystemManagement systemManagement, final SystemSecurityContext systemSecurityContext) { + this.authoritiesExtractor = authoritiesExtractor; + this.systemManagement = systemManagement; + this.systemSecurityContext = systemSecurityContext; + } - void setClientRegistration(final ClientRegistration clientRegistration) { - this.clientRegistration = clientRegistration; - } + void setClientRegistration(final ClientRegistration clientRegistration) { + this.clientRegistration = clientRegistration; + } - @Override - public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) - throws IOException, ServletException { + @Override + public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) + throws IOException, ServletException { + final Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication instanceof JwtAuthenticationToken jwtAuthenticationToken) { + final String defaultTenant = "DEFAULT"; - final Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (authentication instanceof JwtAuthenticationToken) { - final String defaultTenant = "DEFAULT"; + final Jwt jwt = jwtAuthenticationToken.getToken(); + final OidcIdToken idToken = new OidcIdToken(jwt.getTokenValue(), jwt.getIssuedAt(), jwt.getExpiresAt(), + jwt.getClaims()); + final OidcUserInfo userInfo = new OidcUserInfo(jwt.getClaims()); - final JwtAuthenticationToken jwtAuthenticationToken = (JwtAuthenticationToken) authentication; - final Jwt jwt = jwtAuthenticationToken.getToken(); - final OidcIdToken idToken = new OidcIdToken(jwt.getTokenValue(), jwt.getIssuedAt(), jwt.getExpiresAt(), - jwt.getClaims()); - final OidcUserInfo userInfo = new OidcUserInfo(jwt.getClaims()); + final Set authorities = authoritiesExtractor.extract(jwt, clientRegistration); - final Set authorities = authoritiesExtractor.extract(clientRegistration.getClientId(), - jwt.getClaims()); + if (authorities.isEmpty()) { + ((HttpServletResponse) response).sendError(HttpServletResponse.SC_FORBIDDEN); + return; + } - if (authorities.isEmpty()) { - ((HttpServletResponse) response).sendError(HttpServletResponse.SC_FORBIDDEN); - return; - } + final DefaultOidcUser user = new DefaultOidcUser(authorities, idToken, userInfo); - final DefaultOidcUser user = new DefaultOidcUser(authorities, idToken, userInfo); + final OAuth2AuthenticationToken oAuth2AuthenticationToken = new OAuth2AuthenticationToken(user, authorities, + clientRegistration.getRegistrationId()); - final OAuth2AuthenticationToken oAuth2AuthenticationToken = new OAuth2AuthenticationToken(user, authorities, - clientRegistration.getRegistrationId()); + oAuth2AuthenticationToken.setDetails(new TenantAwareAuthenticationDetails(defaultTenant, false)); - oAuth2AuthenticationToken.setDetails(new TenantAwareAuthenticationDetails(defaultTenant, false)); + systemSecurityContext.runAsSystemAsTenant(systemManagement::getTenantMetadata, defaultTenant); + SecurityContextHolder.getContext().setAuthentication(oAuth2AuthenticationToken); + } - systemSecurityContext.runAsSystemAsTenant(systemManagement::getTenantMetadata, defaultTenant); - SecurityContextHolder.getContext().setAuthentication(oAuth2AuthenticationToken); + chain.doFilter(request, response); } - chain.doFilter(request, response); - } - - @Override - public void init(final FilterConfig filterConfig) { - // Nothing to do - } + @Override + public void init(final FilterConfig filterConfig) { + // Nothing to do + } - @Override - public void destroy() { - // Nothing to do + @Override + public void destroy() { + // Nothing to do + } } } diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java index 305ca2f215..90b7e14af9 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.autoconfigure.security; @@ -23,9 +24,9 @@ import org.eclipse.hawkbit.security.SpringSecurityAuditorAware; import org.eclipse.hawkbit.security.SystemSecurityContext; import org.eclipse.hawkbit.tenancy.TenantAware; +import org.eclipse.hawkbit.tenancy.UserAuthoritiesResolver; import org.springframework.boot.actuate.trace.http.HttpTraceRepository; import org.springframework.boot.actuate.trace.http.InMemoryHttpTraceRepository; -import org.eclipse.hawkbit.tenancy.UserAuthoritiesResolver; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.security.SecurityProperties; diff --git a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityManagedConfiguration.java b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityManagedConfiguration.java index ffcc9409e8..14f3d914ab 100644 --- a/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityManagedConfiguration.java +++ b/hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityManagedConfiguration.java @@ -179,7 +179,7 @@ static class ControllerSecurityConfigurationAdapter { public FilterRegistrationBean dosFilterDDI(final HawkbitSecurityProperties securityProperties) { final FilterRegistrationBean filterRegBean = dosFilter(List.of(DDI_ANT_MATCHERS), - securityProperties.getDos().getFilter(), securityProperties.getClients()); + securityProperties.getDos().getFilter(), securityProperties.getClients()); filterRegBean.setOrder(DOS_FILTER_ORDER); filterRegBean.setName("dosDDiFilter"); @@ -321,10 +321,10 @@ protected SecurityFilterChain filterChainDDIDL(final HttpSecurity http) throws E if (ddiSecurityConfiguration.getAuthentication().getAnonymous().isEnabled()) { LOG.info( - """ - ****************** - ** Anonymous controller security enabled, should only be used for developing purposes ** - ******************"""); + """ + ****************** + ** Anonymous controller security enabled, should only be used for developing purposes ** + ******************"""); final AnonymousAuthenticationFilter anonymousFilter = new AnonymousAuthenticationFilter( "controllerAnonymousFilter", "anonymous", @@ -399,8 +399,8 @@ public FilterRegistrationBean dosSystemFilter(final HawkbitSecurityPr } private static FilterRegistrationBean dosFilter(final Collection includeAntPaths, - final HawkbitSecurityProperties.Dos.Filter filterProperties, - final HawkbitSecurityProperties.Clients clientProperties) { + final HawkbitSecurityProperties.Dos.Filter filterProperties, + final HawkbitSecurityProperties.Clients clientProperties) { final FilterRegistrationBean filterRegBean = new FilterRegistrationBean<>(); filterRegBean.setFilter(new DosFilter(includeAntPaths, filterProperties.getMaxRead(), @@ -482,7 +482,8 @@ protected SecurityFilterChain filterChainREST( @Lazy final UserAuthenticationFilter userAuthenticationFilter, @Autowired(required = false) - final OidcBearerTokenAuthenticationFilter oidcBearerTokenAuthenticationFilter, + final OidcUserManagementAutoConfiguration.OidcBearerTokenAuthenticationFilter + oidcBearerTokenAuthenticationFilter, @Autowired(required = false) final InMemoryClientRegistrationRepository clientRegistrationRepository, final SystemManagement systemManagement, @@ -494,9 +495,9 @@ protected SecurityFilterChain filterChainREST( .authorizeHttpRequests(amrmRegistry -> amrmRegistry .antMatchers(MgmtRestConstants.BASE_SYSTEM_MAPPING + "/admin/**") - .hasAnyAuthority(SpPermission.SYSTEM_ADMIN) + .hasAnyAuthority(SpPermission.SYSTEM_ADMIN) .anyRequest() - .authenticated()) + .authenticated()) .addFilterAfter( // Servlet filter to create metadata after successful authentication over RESTful. (request, response, chain) -> { diff --git a/hawkbit-autoconfigure/src/main/resources/hawkbit-artifactdl-defaults.properties b/hawkbit-autoconfigure/src/main/resources/hawkbit-artifactdl-defaults.properties index 551ab88e78..06683b25b4 100644 --- a/hawkbit-autoconfigure/src/main/resources/hawkbit-artifactdl-defaults.properties +++ b/hawkbit-autoconfigure/src/main/resources/hawkbit-artifactdl-defaults.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. +# Copyright (c) 2015 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Download URL generation configuration @@ -14,7 +15,7 @@ hawkbit.artifact.url.protocols.download-http.ip=127.0.0.1 hawkbit.artifact.url.protocols.download-http.protocol=http hawkbit.artifact.url.protocols.download-http.port=8080 hawkbit.artifact.url.protocols.download-http.supports=DMF,DDI -hawkbit.artifact.url.protocols.download-http.ref={protocol}://{hostnameRequest}:{portRequest}/{tenant}/controller/v1/{controllerId}/softwaremodules/{softwareModuleId}/artifacts/{artifactFileName} +hawkbit.artifact.url.protocols.download-http.ref={protocolRequest}://{hostnameRequest}:{portRequest}/{tenant}/controller/v1/{controllerId}/softwaremodules/{softwareModuleId}/artifacts/{artifactFileName} hawkbit.artifact.url.protocols.md5sum-http.rel=md5sum-http hawkbit.artifact.url.protocols.md5sum-http.protocol=${hawkbit.artifact.url.protocols.download-http.protocol} hawkbit.artifact.url.protocols.md5sum-http.hostname=${hawkbit.artifact.url.protocols.download-http.hostname} @@ -28,4 +29,4 @@ hawkbit.artifact.url.protocols.download-cdn-http.ip=127.0.0.1 hawkbit.artifact.url.protocols.download-cdn-http.protocol=http hawkbit.artifact.url.protocols.download-cdn-http.port=8080 hawkbit.artifact.url.protocols.download-cdn-http.supports=MGMT -hawkbit.artifact.url.protocols.download-cdn-http.ref={protocol}://{hostnameRequest}:{portRequest}/rest/v1/softwaremodules/{softwareModuleId}/artifacts/{artifactFileName} \ No newline at end of file +hawkbit.artifact.url.protocols.download-cdn-http.ref={protocolRequest}://{hostnameRequest}:{portRequest}/rest/v1/softwaremodules/{softwareModuleId}/artifacts/{artifactFileName} \ No newline at end of file diff --git a/hawkbit-autoconfigure/src/main/resources/hawkbit-eventbus-defaults.properties b/hawkbit-autoconfigure/src/main/resources/hawkbit-eventbus-defaults.properties index 113fc1b1ac..cefead8945 100644 --- a/hawkbit-autoconfigure/src/main/resources/hawkbit-eventbus-defaults.properties +++ b/hawkbit-autoconfigure/src/main/resources/hawkbit-eventbus-defaults.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. +# Copyright (c) 2015 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Spring cloud bus and stream diff --git a/hawkbit-autoconfigure/src/main/resources/hawkbit-security-defaults.properties b/hawkbit-autoconfigure/src/main/resources/hawkbit-security-defaults.properties index 6b94c10030..ad97e4759d 100644 --- a/hawkbit-autoconfigure/src/main/resources/hawkbit-security-defaults.properties +++ b/hawkbit-autoconfigure/src/main/resources/hawkbit-security-defaults.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. +# Copyright (c) 2015 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # User Security diff --git a/hawkbit-core/pom.xml b/hawkbit-core/pom.xml index c800756f32..47aa05e861 100644 --- a/hawkbit-core/pom.xml +++ b/hawkbit-core/pom.xml @@ -1,11 +1,12 @@ protocols = new HashMap<>(); + public Map getProtocols() { + return protocols; + } + /** * Protocol specific properties to generate URLs accordingly. - * */ public static class UrlProtocol { @@ -49,15 +53,10 @@ public static class UrlProtocol { private String rel = "download-http"; /** - * Hypermedia ref pattern for this protocol. Supported place holders are - * protocol,controllerId,targetId,targetIdBase62,ip,port,hostname, - * artifactFileName,artifactSHA1, - * artifactIdBase62,artifactId,tenant,softwareModuleId, - * softwareModuleIdBase62. - * - * The update server itself supports + * Hypermedia ref pattern for this protocol. Supported placeholders are the properties + * supported by {@link PropertyBasedArtifactUrlHandler}. */ - private String ref = "{protocol}://{hostname}:{port}/{tenant}/controller/v1/{controllerId}/softwaremodules/{softwareModuleId}/artifacts/{artifactFileName}"; + private String ref = PropertyBasedArtifactUrlHandler.DEFAULT_URL_PROTOCOL_REF; /** * Protocol name placeholder that can be used in ref pattern. @@ -149,11 +148,5 @@ public String getProtocol() { public void setProtocol(final String protocol) { this.protocol = protocol; } - } - - public Map getProtocols() { - return protocols; - } - } diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/Base62Util.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/Base62Util.java index 37952b6a24..18eee93437 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/Base62Util.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/Base62Util.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.api; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/HostnameResolver.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/HostnameResolver.java index 2491e85e21..7ff89f350c 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/HostnameResolver.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/HostnameResolver.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.api; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java index de97299544..dc606a8018 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java @@ -1,14 +1,14 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.api; -import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -22,8 +22,7 @@ import java.util.stream.Collectors; import org.eclipse.hawkbit.api.ArtifactUrlHandlerProperties.UrlProtocol; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; /** @@ -35,27 +34,27 @@ * well in the following {@link UrlProtocol#getRef()} patterns: * * Default: - * {protocol}://{hostname}:{port}/{tenant}/controller/v1/{controllerId}/ + * {protocol}://{hostname}:{port}{contextPath}/{tenant}/controller/v1/{controllerId}/ * softwaremodules/{softwareModuleId}/artifacts/{artifactFileName} * * Default (MD5SUM files): - * {protocol}://{hostname}:{port}/{tenant}/controller/v1/{controllerId}/ + * {protocol}://{hostname}:{port}{contextPath}/{tenant}/controller/v1/{controllerId}/ * softwaremodules/{softwareModuleId}/artifacts/{artifactFileName}.MD5SUM * */ public class PropertyBasedArtifactUrlHandler implements ArtifactUrlHandler { - private static final Logger LOG = LoggerFactory.getLogger(PropertyBasedArtifactUrlHandler.class); - private static final String PROTOCOL_PLACEHOLDER = "protocol"; + private static final String HOSTNAME_PLACEHOLDER = "hostname"; + private static final String IP_PLACEHOLDER = "ip"; + private static final String PORT_PLACEHOLDER = "port"; + private static final String CONTEXT_PATH = "contextPath"; private static final String CONTROLLER_ID_PLACEHOLDER = "controllerId"; private static final String TARGET_ID_BASE10_PLACEHOLDER = "targetId"; private static final String TARGET_ID_BASE62_PLACEHOLDER = "targetIdBase62"; - private static final String IP_PLACEHOLDER = "ip"; - private static final String PORT_PLACEHOLDER = "port"; - private static final String HOSTNAME_PLACEHOLDER = "hostname"; private static final String HOSTNAME_REQUEST_PLACEHOLDER = "hostnameRequest"; private static final String PORT_REQUEST_PLACEHOLDER = "portRequest"; + private static final String PROTOCOL_REQUEST_PLACEHOLDER = "protocolRequest"; private static final String HOSTNAME_WITH_DOMAIN_REQUEST_PLACEHOLDER = "domainRequest"; private static final String ARTIFACT_FILENAME_PLACEHOLDER = "artifactFileName"; private static final String ARTIFACT_SHA1_PLACEHOLDER = "artifactSHA1"; @@ -64,17 +63,21 @@ public class PropertyBasedArtifactUrlHandler implements ArtifactUrlHandler { private static final String TENANT_PLACEHOLDER = "tenant"; private static final String TENANT_ID_BASE10_PLACEHOLDER = "tenantId"; private static final String TENANT_ID_BASE62_PLACEHOLDER = "tenantIdBase62"; - private static final String SOFTWARE_MODULE_ID_BASE10_PLACDEHOLDER = "softwareModuleId"; - private static final String SOFTWARE_MODULE_ID_BASE62_PLACDEHOLDER = "softwareModuleIdBase62"; + private static final String SOFTWARE_MODULE_ID_BASE10_PLACEHOLDER = "softwareModuleId"; + private static final String SOFTWARE_MODULE_ID_BASE62_PLACEHOLDER = "softwareModuleIdBase62"; + + final static String DEFAULT_URL_PROTOCOL_REF = "{" + PROTOCOL_PLACEHOLDER + "}://{" + HOSTNAME_PLACEHOLDER + "}:{" + PORT_PLACEHOLDER + "}{" + CONTEXT_PATH + "}/{" + TENANT_PLACEHOLDER + "}/controller/v1/{" + CONTROLLER_ID_PLACEHOLDER + "}/softwaremodules/{" + SOFTWARE_MODULE_ID_BASE10_PLACEHOLDER + "}/artifacts/{" + ARTIFACT_FILENAME_PLACEHOLDER + "}"; private final ArtifactUrlHandlerProperties urlHandlerProperties; + private final String contextPath; /** * @param urlHandlerProperties * for URL generation configuration */ - public PropertyBasedArtifactUrlHandler(final ArtifactUrlHandlerProperties urlHandlerProperties) { + public PropertyBasedArtifactUrlHandler(final ArtifactUrlHandlerProperties urlHandlerProperties, final String contextPath) { this.urlHandlerProperties = urlHandlerProperties; + this.contextPath = contextPath == null || "/".equals(contextPath) ? "" : contextPath; // normalize } @Override @@ -84,7 +87,6 @@ public List getUrls(final URLPlaceholder placeholder, final ApiType @Override public List getUrls(final URLPlaceholder placeholder, final ApiType api, final URI requestUri) { - return urlHandlerProperties.getProtocols().values().stream() .filter(urlProtocol -> urlProtocol.getSupports().contains(api) && urlProtocol.isEnabled()) .map(urlProtocol -> new ArtifactUrl(urlProtocol.getProtocol().toUpperCase(), urlProtocol.getRel(), @@ -93,7 +95,7 @@ public List getUrls(final URLPlaceholder placeholder, final ApiType } - private static String generateUrl(final UrlProtocol protocol, final URLPlaceholder placeholder, + private String generateUrl(final UrlProtocol protocol, final URLPlaceholder placeholder, final URI requestUri) { final Set> entrySet = getReplaceMap(protocol, placeholder, requestUri).entrySet(); @@ -102,32 +104,33 @@ private static String generateUrl(final UrlProtocol protocol, final URLPlacehold for (final Entry entry : entrySet) { if (entry.getKey().equals(PORT_PLACEHOLDER)) { urlPattern = urlPattern.replace(":{" + entry.getKey() + "}", - StringUtils.isEmpty(entry.getValue()) ? "" : (":" + entry.getValue())); + ObjectUtils.isEmpty(entry.getValue()) ? "" : (":" + entry.getValue())); } else { if(entry.getValue() != null) { urlPattern = urlPattern.replace("{" + entry.getKey() + "}", entry.getValue()); } } } + return urlPattern; } - private static Map getReplaceMap(final UrlProtocol protocol, final URLPlaceholder placeholder, + private Map getReplaceMap(final UrlProtocol protocol, final URLPlaceholder placeholder, final URI requestUri) { final Map replaceMap = new HashMap<>(); replaceMap.put(IP_PLACEHOLDER, protocol.getIp()); + replaceMap.put(HOSTNAME_PLACEHOLDER, protocol.getHostname()); replaceMap.put(HOSTNAME_REQUEST_PLACEHOLDER, getRequestHost(protocol, requestUri)); replaceMap.put(PORT_REQUEST_PLACEHOLDER, getRequestPort(protocol, requestUri)); replaceMap.put(HOSTNAME_WITH_DOMAIN_REQUEST_PLACEHOLDER, computeHostWithRequestDomain(protocol, requestUri)); + replaceMap.put(PROTOCOL_REQUEST_PLACEHOLDER, getRequestProtocol(protocol, requestUri)); - try { - replaceMap.put(ARTIFACT_FILENAME_PLACEHOLDER, - URLEncoder.encode(placeholder.getSoftwareData().getFilename(), StandardCharsets.UTF_8.toString())); - } catch (final UnsupportedEncodingException e) { - LOG.error("Could not encode {}", placeholder.getSoftwareData().getFilename(), e); - } + replaceMap.put(CONTEXT_PATH, contextPath); + + replaceMap.put(ARTIFACT_FILENAME_PLACEHOLDER, + URLEncoder.encode(placeholder.getSoftwareData().getFilename(), StandardCharsets.UTF_8)); replaceMap.put(ARTIFACT_SHA1_PLACEHOLDER, placeholder.getSoftwareData().getSha1Hash()); replaceMap.put(PROTOCOL_PLACEHOLDER, protocol.getProtocol()); @@ -137,15 +140,15 @@ private static Map getReplaceMap(final UrlProtocol protocol, fin replaceMap.put(TENANT_ID_BASE62_PLACEHOLDER, Base62Util.fromBase10(placeholder.getTenantId())); replaceMap.put(CONTROLLER_ID_PLACEHOLDER, placeholder.getControllerId()); replaceMap.put(TARGET_ID_BASE10_PLACEHOLDER, String.valueOf(placeholder.getTargetId())); - if(placeholder.getTargetId() != null) { + if (placeholder.getTargetId() != null) { replaceMap.put(TARGET_ID_BASE62_PLACEHOLDER, Base62Util.fromBase10(placeholder.getTargetId())); } replaceMap.put(ARTIFACT_ID_BASE62_PLACEHOLDER, Base62Util.fromBase10(placeholder.getSoftwareData().getArtifactId())); replaceMap.put(ARTIFACT_ID_BASE10_PLACEHOLDER, String.valueOf(placeholder.getSoftwareData().getArtifactId())); - replaceMap.put(SOFTWARE_MODULE_ID_BASE10_PLACDEHOLDER, + replaceMap.put(SOFTWARE_MODULE_ID_BASE10_PLACEHOLDER, String.valueOf(placeholder.getSoftwareData().getSoftwareModuleId())); - replaceMap.put(SOFTWARE_MODULE_ID_BASE62_PLACDEHOLDER, + replaceMap.put(SOFTWARE_MODULE_ID_BASE62_PLACEHOLDER, Base62Util.fromBase10(placeholder.getSoftwareData().getSoftwareModuleId())); return replaceMap; } @@ -166,8 +169,16 @@ private static String getRequestHost(final UrlProtocol protocol, final URI reque return Optional.ofNullable(requestUri.getHost()).orElse(protocol.getHostname()); } + private static String getRequestProtocol(final UrlProtocol protocol, final URI requestUri) { + if (requestUri == null) { + return protocol.getProtocol(); + } + + return Optional.ofNullable(requestUri.getScheme()).orElse(protocol.getProtocol()); + } + private static String getPort(final UrlProtocol protocol) { - return protocol.getPort() == null ? null : String.valueOf(protocol.getPort()); + return ObjectUtils.isEmpty(protocol.getPort()) ? null : String.valueOf(protocol.getPort()); } private static String computeHostWithRequestDomain(final UrlProtocol protocol, final URI requestUri) { @@ -187,7 +198,7 @@ private static String computeHostWithRequestDomain(final UrlProtocol protocol, f final String domain = StringUtils.collectionToDelimitedString(domainElements.subList(1, domainElements.size()), "."); - if (StringUtils.isEmpty(domain)) { + if (ObjectUtils.isEmpty(domain)) { return protocol.getHostname(); } diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ProtocolProperties.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ProtocolProperties.java index 57f376c4ec..3f152dc350 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ProtocolProperties.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ProtocolProperties.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.api; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/URLPlaceholder.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/URLPlaceholder.java index f5448a28b6..be82ee715b 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/URLPlaceholder.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/api/URLPlaceholder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.api; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java index c5aa7da6b7..ef4751a04f 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/AbstractArtifactRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.artifact.repository; @@ -117,7 +118,7 @@ protected String storeTempFile(final InputStream content) throws IOException { private static File createTempFile() { try { - return File.createTempFile(TEMP_FILE_PREFIX, TEMP_FILE_SUFFIX); + return Files.createTempFile(TEMP_FILE_PREFIX, TEMP_FILE_SUFFIX).toFile(); } catch (final IOException e) { throw new ArtifactStoreException("Cannot create tempfile", e); } diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactRepository.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactRepository.java index f1adcba846..6d6d5b2698 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactRepository.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.artifact.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactStoreException.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactStoreException.java index 41932be702..ea26ceab84 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactStoreException.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/ArtifactStoreException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.artifact.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/HashNotMatchException.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/HashNotMatchException.java index 17073bbe98..e455b03f8c 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/HashNotMatchException.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/HashNotMatchException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.artifact.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/AbstractDbArtifact.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/AbstractDbArtifact.java index 4ef06268da..e16730c165 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/AbstractDbArtifact.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/AbstractDbArtifact.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.artifact.repository.model; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/DbArtifact.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/DbArtifact.java index 0af9d3faed..b6318dfbfa 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/DbArtifact.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/DbArtifact.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.artifact.repository.model; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/DbArtifactHash.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/DbArtifactHash.java index 2c6112aedd..70195649b4 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/DbArtifactHash.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/artifact/repository/model/DbArtifactHash.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.artifact.repository.model; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCache.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCache.java index 9ac106c479..f08b098976 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCache.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCache.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.cache; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DownloadArtifactCache.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DownloadArtifactCache.java index 50dd46c988..f714170f4a 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DownloadArtifactCache.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DownloadArtifactCache.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.cache; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DownloadIdCache.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DownloadIdCache.java index 77dcb714d0..e2202e6198 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DownloadIdCache.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DownloadIdCache.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.cache; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DownloadType.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DownloadType.java index b903fbd1c2..10e642f037 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DownloadType.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/DownloadType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.cache; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/TenancyCacheManager.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/TenancyCacheManager.java index 26e744367b..4ccdf06cc6 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/TenancyCacheManager.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/TenancyCacheManager.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.cache; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/TenantAwareCacheManager.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/TenantAwareCacheManager.java index 2688fd2ae6..dcf81f576f 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/TenantAwareCacheManager.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/cache/TenantAwareCacheManager.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.cache; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/AbstractServerRtException.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/AbstractServerRtException.java index b60fe13101..38f591250f 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/AbstractServerRtException.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/AbstractServerRtException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.exception; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/GenericSpServerException.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/GenericSpServerException.java index 4ac02e0812..50123cec29 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/GenericSpServerException.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/GenericSpServerException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.exception; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java index 4e12ceff8a..823ac859f9 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/exception/SpServerError.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.exception; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionFields.java index 432c8b44ac..6cacbe1ead 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionStatusFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionStatusFields.java index ef8bf3c987..b25adc1da3 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionStatusFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/ActionStatusFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetFields.java index 1bf73e5020..3469482ceb 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; @@ -68,7 +69,6 @@ public enum DistributionSetFields implements FieldNameProvider { * The metadata. */ METADATA("metadata", new SimpleImmutableEntry<>("key", "value")), - /** * The valid field. */ diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetMetadataFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetMetadataFields.java index abef365cfe..1d022a2860 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetMetadataFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetMetadataFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagFields.java index db8aaa5de5..2055024bbb 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2023 Bosch.IO GmbH and others. + * Copyright (c) 2023 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTypeFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTypeFields.java index f8e9e86716..040681b39e 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTypeFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTypeFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/FieldNameProvider.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/FieldNameProvider.java index c15475836f..6e6df37767 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/FieldNameProvider.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/FieldNameProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/FieldValueConverter.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/FieldValueConverter.java index b8b83de6fb..76d6fb3836 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/FieldValueConverter.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/FieldValueConverter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RolloutFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RolloutFields.java index dbec38c815..961a3a6aa4 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RolloutFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RolloutFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupFields.java index 2c8ebf8ac0..0c856239dc 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleFields.java index 0587a03496..b87c1d178a 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleMetadataFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleMetadataFields.java index d3a86f1652..ad559d5612 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleMetadataFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleMetadataFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleTypeFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleTypeFields.java index 68e4f44270..7341374816 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleTypeFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleTypeFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TagFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TagFields.java index 25cfb29340..0d9c84a6a8 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TagFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TagFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java index deca8cd159..2734fcffd0 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryFields.java index 7378589a21..3bf9c17223 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetMetadataFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetMetadataFields.java index a9fe24649d..137cbdcb9e 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetMetadataFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetMetadataFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetTagFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetTagFields.java index f042b4bb10..b3e7447751 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetTagFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetTagFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2023 Bosch.IO GmbH and others. + * Copyright (c) 2023 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetTypeFields.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetTypeFields.java index 54cf9c4545..6c117de0f3 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetTypeFields.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/repository/TargetTypeFields.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/TenantAware.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/TenantAware.java index 6925b33c22..e12cd96e5c 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/TenantAware.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/TenantAware.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.tenancy; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/UserAuthoritiesResolver.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/UserAuthoritiesResolver.java index e438379535..55a2bd5643 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/UserAuthoritiesResolver.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/UserAuthoritiesResolver.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.tenancy; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/InvalidTenantConfigurationKeyException.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/InvalidTenantConfigurationKeyException.java index 28337d85f8..05a40f3fa8 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/InvalidTenantConfigurationKeyException.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/InvalidTenantConfigurationKeyException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.tenancy.configuration; diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationValidatorException.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationValidatorException.java index 07ff99820d..7ecd18adf5 100644 --- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationValidatorException.java +++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationValidatorException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.tenancy.configuration.validator; diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java index 90b32d8310..174a5c8eb3 100644 --- a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java +++ b/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/Base62UtilTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.api; diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java index 2ab19d884d..daffabbd4b 100644 --- a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java +++ b/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandlerTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.api; @@ -61,7 +62,7 @@ public class PropertyBasedArtifactUrlHandlerTest { @BeforeEach public void setup() { properties = new ArtifactUrlHandlerProperties(); - urlHandlerUnderTest = new PropertyBasedArtifactUrlHandler(properties); + urlHandlerUnderTest = new PropertyBasedArtifactUrlHandler(properties, ""); } @@ -87,7 +88,7 @@ public void urlGenerationWithCustomConfiguration() { proto.setPort(5683); proto.setProtocol(TEST_PROTO); proto.setRel(TEST_REL); - proto.setSupports(Arrays.asList(ApiType.DMF)); + proto.setSupports(List.of(ApiType.DMF)); proto.setRef("{protocol}://{ip}:{port}/fw/{tenant}/{controllerId}/sha1/{artifactSHA1}"); properties.getProtocols().put(TEST_PROTO, proto); @@ -108,7 +109,7 @@ public void urlGenerationWithCustomShortConfiguration() { proto.setPort(5683); proto.setProtocol(TEST_PROTO); proto.setRel(TEST_REL); - proto.setSupports(Arrays.asList(ApiType.DMF)); + proto.setSupports(List.of(ApiType.DMF)); proto.setRef("{protocol}://{ip}:{port}/fws/{tenant}/{targetIdBase62}/{artifactIdBase62}"); properties.getProtocols().put("ftp", proto); @@ -131,7 +132,7 @@ public void urlGenerationWithHostFromRequest() throws URISyntaxException { proto.setPort(5683); proto.setProtocol(TEST_PROTO); proto.setRel(TEST_REL); - proto.setSupports(Arrays.asList(ApiType.DDI)); + proto.setSupports(List.of(ApiType.DDI)); proto.setRef("{protocol}://{hostnameRequest}:{port}/fws/{tenant}/{targetIdBase62}/{artifactIdBase62}"); properties.getProtocols().put("ftp", proto); @@ -141,6 +142,21 @@ public void urlGenerationWithHostFromRequest() throws URISyntaxException { assertThat(urls).containsExactly(new ArtifactUrl(TEST_PROTO.toUpperCase(), TEST_REL, TEST_PROTO + "://" + testHost + ":5683/fws/" + TENANT + "/" + TARGETID_BASE62 + "/" + ARTIFACTID_BASE62)); } + @Test + @Description("Verfies that the protocol of the statically defined hostname is replaced with the protocol of the request.") + public void urlGenerationWithProtocolFromRequest() throws URISyntaxException { + final String testHost = "ddi.host.com"; + + final UrlProtocol proto = new UrlProtocol(); + proto.setRef("{protocolRequest}://{hostname}:{port}/fws/{tenant}/{targetIdBase62}/{artifactIdBase62}"); + properties.getProtocols().put("download-http", proto); + + final List urls = urlHandlerUnderTest.getUrls(placeholder, ApiType.DDI, + new URI("https://" + testHost)); + + assertThat(urls).containsExactly(new ArtifactUrl("http".toUpperCase(), "download-http", + "https://localhost:8080/fws/" + TENANT + "/" + TARGETID_BASE62 + "/" + ARTIFACTID_BASE62)); + } @Test @Description("Verfies that the port of the statically defined hostname is replaced with the port of the request.") diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/URLPlaceholderTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/URLPlaceholderTest.java index 6c08e7e2a9..c64c60be21 100644 --- a/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/URLPlaceholderTest.java +++ b/hawkbit-core/src/test/java/org/eclipse/hawkbit/api/URLPlaceholderTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.api; diff --git a/hawkbit-core/src/test/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCacheTest.java b/hawkbit-core/src/test/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCacheTest.java index f721880c4d..91fefbce0c 100644 --- a/hawkbit-core/src/test/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCacheTest.java +++ b/hawkbit-core/src/test/java/org/eclipse/hawkbit/cache/DefaultDownloadIdCacheTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.cache; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml b/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml index a8accd3719..2127ed3d8b 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml +++ b/hawkbit-dmf/hawkbit-dmf-amqp/pom.xml @@ -1,11 +1,12 @@ diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AbstractAmqpErrorHandler.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AbstractAmqpErrorHandler.java index e7e84454e6..fc336916a2 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AbstractAmqpErrorHandler.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AbstractAmqpErrorHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpAuthenticationMessageHandler.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpAuthenticationMessageHandler.java index b019dd280e..bddcb3c674 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpAuthenticationMessageHandler.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpAuthenticationMessageHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java index e727bb0b88..075d04805f 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentication.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentication.java index 1829997355..7bfce93918 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentication.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentication.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpDeadletterProperties.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpDeadletterProperties.java index 5f06b3619b..41b9d1b3f6 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpDeadletterProperties.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpDeadletterProperties.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpErrorHandler.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpErrorHandler.java index 9580dd135f..f1bb639823 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpErrorHandler.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpErrorHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpErrorHandlerChain.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpErrorHandlerChain.java index 535b9de196..b258531ab1 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpErrorHandlerChain.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpErrorHandlerChain.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpErrorMessageComposer.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpErrorMessageComposer.java index 14b8c83271..33c5954a3b 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpErrorMessageComposer.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpErrorMessageComposer.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java index 94b2b9ea50..a459141d66 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java index d98fa7d732..80ca28762f 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageSenderService.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageSenderService.java index 74df554b8c..2b5b648c7e 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageSenderService.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageSenderService.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.java index 6336f1b41a..f1032fc52b 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/BaseAmqpService.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/BaseAmqpService.java index ca27006c40..fcfbacc7c6 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/BaseAmqpService.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/BaseAmqpService.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/ConfigurableRabbitListenerContainerFactory.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/ConfigurableRabbitListenerContainerFactory.java index d5dc8d204f..910de28084 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/ConfigurableRabbitListenerContainerFactory.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/ConfigurableRabbitListenerContainerFactory.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DefaultAmqpMessageSenderService.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DefaultAmqpMessageSenderService.java index 4976a8dec0..e3ebd0a502 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DefaultAmqpMessageSenderService.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DefaultAmqpMessageSenderService.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DelayedRequeueExceptionStrategy.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DelayedRequeueExceptionStrategy.java index dc917ded65..70c05b24b1 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DelayedRequeueExceptionStrategy.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DelayedRequeueExceptionStrategy.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DelegatingConditionalErrorHandler.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DelegatingConditionalErrorHandler.java index 568ed6bf79..4ebd889ca3 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DelegatingConditionalErrorHandler.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DelegatingConditionalErrorHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DmfApiConfiguration.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DmfApiConfiguration.java index 50b52cca4f..ef2781e845 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DmfApiConfiguration.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/DmfApiConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/EntityNotFoundExceptionHandler.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/EntityNotFoundExceptionHandler.java index 0984a7a0f4..79837805d9 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/EntityNotFoundExceptionHandler.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/EntityNotFoundExceptionHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/InvalidTargetAttributeExceptionHandler.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/InvalidTargetAttributeExceptionHandler.java index 45ed32755e..e2512d0959 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/InvalidTargetAttributeExceptionHandler.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/InvalidTargetAttributeExceptionHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/MessageConversionExceptionHandler.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/MessageConversionExceptionHandler.java index 0a3590e18d..46f5a819ca 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/MessageConversionExceptionHandler.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/MessageConversionExceptionHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/resources/hawkbit-dmf-defaults.properties b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/resources/hawkbit-dmf-defaults.properties index 45471b9b0f..70d2a21028 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/main/resources/hawkbit-dmf-defaults.properties +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/main/resources/hawkbit-dmf-defaults.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. +# Copyright (c) 2015 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # ## DMF RabbitMQ configuration - START diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java index d92e9557ad..358cc24a4c 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java index bf77112686..fbbe9e974c 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java index 049e7e7e94..64e7895334 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/BaseAmqpServiceTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/BaseAmqpServiceTest.java index b73b5c74e7..fb16293ac6 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/BaseAmqpServiceTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/BaseAmqpServiceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/DelegatingAmqpErrorHandlerTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/DelegatingAmqpErrorHandlerTest.java index 68dc2b73f7..b979c9194a 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/DelegatingAmqpErrorHandlerTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/DelegatingAmqpErrorHandlerTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.amqp; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AbstractAmqpServiceIntegrationTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AbstractAmqpServiceIntegrationTest.java index 82bd0020c7..ac6de2850c 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AbstractAmqpServiceIntegrationTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AbstractAmqpServiceIntegrationTest.java @@ -439,9 +439,6 @@ protected void assertUpdateAttributes(final String controllerId, final Map assertKeyValueInMap(k, v, controllerAttributes)); - - assertThat(controllerAttributes.size()).isEqualTo(attributes.size()); - assertThat(controllerAttributes).containsAllEntriesOf(attributes); } catch (final Exception e) { throw new RuntimeException(e); } diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpAuthenticationMessageHandlerIntegrationTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpAuthenticationMessageHandlerIntegrationTest.java index 3a6ab21a9f..0d16476201 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpAuthenticationMessageHandlerIntegrationTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpAuthenticationMessageHandlerIntegrationTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.integration; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageDispatcherServiceIntegrationTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageDispatcherServiceIntegrationTest.java index cb40155380..5e59035f78 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageDispatcherServiceIntegrationTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageDispatcherServiceIntegrationTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.integration; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java index 82114750f9..1ee43f13ac 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/AmqpMessageHandlerServiceIntegrationTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.integration; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/DmfTestConfiguration.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/DmfTestConfiguration.java index d603b8f7d3..90e7d4b5d4 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/DmfTestConfiguration.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/DmfTestConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.integration; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/listener/DeadletterListener.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/listener/DeadletterListener.java index 23fe4c6768..5c337a516e 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/listener/DeadletterListener.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/listener/DeadletterListener.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.integration.listener; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/listener/ReplyToListener.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/listener/ReplyToListener.java index 440c482965..b4e9cfd8bd 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/listener/ReplyToListener.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/integration/listener/ReplyToListener.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.integration.listener; diff --git a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/matcher/SoftwareModuleJsonMatcher.java b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/matcher/SoftwareModuleJsonMatcher.java index 00d2f6031a..95d48fc40d 100644 --- a/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/matcher/SoftwareModuleJsonMatcher.java +++ b/hawkbit-dmf/hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/matcher/SoftwareModuleJsonMatcher.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.matcher; diff --git a/hawkbit-dmf/hawkbit-dmf-api/pom.xml b/hawkbit-dmf/hawkbit-dmf-api/pom.xml index 69bc7e8233..b749205e41 100644 --- a/hawkbit-dmf/hawkbit-dmf-api/pom.xml +++ b/hawkbit-dmf/hawkbit-dmf-api/pom.xml @@ -1,11 +1,12 @@ @@ -61,11 +62,6 @@ spring-boot-starter-web compile - - org.apache.httpcomponents - httpclient - compile - org.springframework.amqp spring-rabbit-test diff --git a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AbstractAmqpIntegrationTest.java b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AbstractAmqpIntegrationTest.java index 68d59e2bae..90bf24b8d6 100644 --- a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AbstractAmqpIntegrationTest.java +++ b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AbstractAmqpIntegrationTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rabbitmq.test; diff --git a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AmqpTestConfiguration.java b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AmqpTestConfiguration.java index 0a21198340..a0e320a330 100644 --- a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AmqpTestConfiguration.java +++ b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/AmqpTestConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rabbitmq.test; diff --git a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/RabbitMqSetupService.java b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/RabbitMqSetupService.java index 305469a9c0..f453ab2ec7 100644 --- a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/RabbitMqSetupService.java +++ b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/RabbitMqSetupService.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rabbitmq.test; @@ -18,9 +19,8 @@ import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.junit.BrokerRunningSupport; -import org.springframework.util.StringUtils; -import com.google.common.base.Throwables; import org.springframework.util.ObjectUtils; + import com.rabbitmq.http.client.Client; import com.rabbitmq.http.client.domain.UserPermissions; diff --git a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/listener/TestRabbitListener.java b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/listener/TestRabbitListener.java index 7342781ae0..ff46376866 100644 --- a/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/listener/TestRabbitListener.java +++ b/hawkbit-dmf/hawkbit-dmf-rabbitmq-test/src/main/java/org/eclipse/hawkbit/rabbitmq/test/listener/TestRabbitListener.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rabbitmq.test.listener; diff --git a/hawkbit-dmf/pom.xml b/hawkbit-dmf/pom.xml index d888959d47..6461c19353 100644 --- a/hawkbit-dmf/pom.xml +++ b/hawkbit-dmf/pom.xml @@ -1,11 +1,12 @@ diff --git a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/AbstractHttpControllerAuthenticationFilter.java b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/AbstractHttpControllerAuthenticationFilter.java index dabf930742..9eab33dcdf 100644 --- a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/AbstractHttpControllerAuthenticationFilter.java +++ b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/AbstractHttpControllerAuthenticationFilter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.security; diff --git a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/ControllerTenantAwareAuthenticationDetailsSource.java b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/ControllerTenantAwareAuthenticationDetailsSource.java index 7fa94999b7..cd8881afa8 100644 --- a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/ControllerTenantAwareAuthenticationDetailsSource.java +++ b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/ControllerTenantAwareAuthenticationDetailsSource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.security; diff --git a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/DosFilter.java b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/DosFilter.java index ab5e0d7e52..2b15036a2c 100644 --- a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/DosFilter.java +++ b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/DosFilter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.security; diff --git a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateAnonymousDownloadFilter.java b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateAnonymousDownloadFilter.java index 532f581f41..5ba37fdb0c 100644 --- a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateAnonymousDownloadFilter.java +++ b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateAnonymousDownloadFilter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.security; diff --git a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateSecurityTokenFilter.java b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateSecurityTokenFilter.java index 1c5ce0a60b..649cb473df 100644 --- a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateSecurityTokenFilter.java +++ b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateSecurityTokenFilter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.security; diff --git a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedGatewaySecurityTokenFilter.java b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedGatewaySecurityTokenFilter.java index 4af1a0140c..2e6db211bb 100644 --- a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedGatewaySecurityTokenFilter.java +++ b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedGatewaySecurityTokenFilter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.security; diff --git a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedSecurityHeaderFilter.java b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedSecurityHeaderFilter.java index 20f60d98ba..73adca1427 100644 --- a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedSecurityHeaderFilter.java +++ b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticatedSecurityHeaderFilter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.security; diff --git a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpDownloadAuthenticationFilter.java b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpDownloadAuthenticationFilter.java index 56755bddd5..5f1035ad32 100644 --- a/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpDownloadAuthenticationFilter.java +++ b/hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpDownloadAuthenticationFilter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.security; diff --git a/hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java b/hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java index 066a4b5b12..cc7c0febac 100644 --- a/hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java +++ b/hawkbit-http-security/src/test/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProviderTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.security; diff --git a/hawkbit-repository/hawkbit-repository-api/pom.xml b/hawkbit-repository/hawkbit-repository-api/pom.xml index 93327d78b9..24c27ddce9 100644 --- a/hawkbit-repository/hawkbit-repository-api/pom.xml +++ b/hawkbit-repository/hawkbit-repository-api/pom.xml @@ -1,11 +1,12 @@ getStatus(@NotEmpty String controllerId); /** diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Constants.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Constants.java index eba67d58fe..04ea67b5b5 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Constants.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Constants.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java index 2b5234f103..e3f70c352c 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ControllerManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DeploymentManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DeploymentManagement.java index 41c8e7ed80..808a438cd9 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DeploymentManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DeploymentManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetInvalidationManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetInvalidationManagement.java index 2b5b9a8dad..0d1131aa0b 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetInvalidationManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetInvalidationManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java index c90e0aa99a..c193ef0e0f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagManagement.java index 4382b099b0..fc130cb107 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTagManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTypeManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTypeManagement.java index b033380ca4..8747e3e2b5 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTypeManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetTypeManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/EntityFactory.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/EntityFactory.java index b5fb5c3906..9d770fce31 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/EntityFactory.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/EntityFactory.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/FilterParams.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/FilterParams.java index 21238d4ae4..67006124c6 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/FilterParams.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/FilterParams.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Identifiable.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Identifiable.java index a2e71a32bb..dd4b319444 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Identifiable.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/Identifiable.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelper.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelper.java index 3bc354181f..8b4add9766 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelper.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) Siemens AG, 2018 + * Copyright (c) 2018 Siemens AG * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/OffsetBasedPageRequest.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/OffsetBasedPageRequest.java index a0b4ccc3b5..87888c772a 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/OffsetBasedPageRequest.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/OffsetBasedPageRequest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/QuotaManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/QuotaManagement.java index ce965854da..42763b4ed4 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/QuotaManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/QuotaManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RegexCharacterCollection.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RegexCharacterCollection.java index 1d1f48793a..b5fd5399e9 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RegexCharacterCollection.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RegexCharacterCollection.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RepositoryConstants.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RepositoryConstants.java index b7a9723442..9ceb2a7d3e 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RepositoryConstants.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RepositoryConstants.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RepositoryManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RepositoryManagement.java index a210703a15..cf970f6c84 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RepositoryManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RepositoryManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RepositoryProperties.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RepositoryProperties.java index 84cde3ad4b..c67549faeb 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RepositoryProperties.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RepositoryProperties.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutExecutor.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutExecutor.java index 7dfe4f7494..e027b742f1 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutExecutor.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutExecutor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupManagement.java index 47a683b122..22bce81810 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutHandler.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutHandler.java index bd8086da19..6ca8d92a3d 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutHandler.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2023 Bosch.IO GmbH and others. + * Copyright (c) 2023 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java index 4ec47272d5..cc57efd52e 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; @@ -457,6 +458,7 @@ Slice findByFiltersWithDetailedStatus(@NotNull Pageable pageable, @NotE */ @PreAuthorize(SpringEvalExpressions.IS_SYSTEM_CODE) void setRolloutAsCleanedUp(@NotNull final Rollout rollout); + /** * Cancels all rollouts that refer to the given {@link DistributionSet}. * This is called when a distribution set is invalidated and the cancel @@ -494,4 +496,5 @@ Slice findByFiltersWithDetailedStatus(@NotNull Pageable pageable, @NotE */ @PreAuthorize(SpringEvalExpressions.HAS_AUTH_ROLLOUT_MANAGEMENT_UPDATE) void setRolloutStatusDetails(final Slice rollouts); + } diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SizeConversionHelper.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SizeConversionHelper.java index cc1c4a4718..9e590010b3 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SizeConversionHelper.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SizeConversionHelper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleManagement.java index 752111b3d6..8f64b78084 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleTypeManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleTypeManagement.java index b6a1105701..e19810e025 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleTypeManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SoftwareModuleTypeManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SystemManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SystemManagement.java index bddbf8cacf..ffb1e09f25 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SystemManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/SystemManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagement.java index ee470fe91a..e3f11b880b 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java index d3691eb616..01d08b4209 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; @@ -146,6 +147,21 @@ public interface TargetManagement { @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET) long countByRsqlAndCompatible(@NotEmpty String rsqlParam, @NotNull Long dsTypeId); + /** + * Count all targets with failed actions for specific Rollout + * and that are compatible with the passed {@link DistributionSetType} + * and created after given timestamp + * + * @param rolloutId + * rolloutId of the rollout to be retried. + * @param dsTypeId + * ID of the {@link DistributionSetType} the targets need to be + * compatible with + * @return the found number of{@link Target}s + */ + @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET) + long countByFailedInRollout(@NotEmpty String rolloutId, @NotNull Long dsTypeId); + /** * Count {@link TargetFilterQuery}s for given target filter query. * @@ -294,6 +310,23 @@ Slice findByTargetFilterQueryAndNotInRolloutGroupsAndCompatible(@NotNull @NotEmpty Collection groups, @NotNull String rsqlParam, @NotNull DistributionSetType distributionSetType); + /** + * Finds all targets with failed actions for specific Rollout + * and that are not assigned to one of the retried {@link RolloutGroup}s and are + * compatible with the passed {@link DistributionSetType}. + * + * @param pageRequest + * the pageRequest to enhance the query for paging and sorting + * @param groups + * the list of {@link RolloutGroup}s + * @param rolloutId + * rolloutId of the rollout to be retried. + * @return a page of the found {@link Target}s + */ + @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET) + Slice findByFailedRolloutAndNotInRolloutGroups(@NotNull Pageable pageRequest, + @NotEmpty Collection groups, @NotNull String rolloutId); + /** * Counts all targets for all the given parameter {@link TargetFilterQuery} * and that are not assigned to one of the {@link RolloutGroup}s and are @@ -312,6 +345,20 @@ Slice findByTargetFilterQueryAndNotInRolloutGroupsAndCompatible(@NotNull long countByRsqlAndNotInRolloutGroupsAndCompatible(@NotEmpty Collection groups, @NotNull String rsqlParam, @NotNull DistributionSetType distributionSetType); + /** + * Counts all targets with failed actions for specific Rollout + * and that are not assigned to one of the {@link RolloutGroup}s and are + * compatible with the passed {@link DistributionSetType}. + * + * @param groups + * the list of {@link RolloutGroup}s + * @param rolloutId + * rolloutId of the rollout to be retried. + * @return count of the found {@link Target}s + */ + @PreAuthorize(SpringEvalExpressions.HAS_AUTH_READ_TARGET) + long countByFailedRolloutAndNotInRolloutGroups(@NotEmpty Collection groups, @NotNull String rolloutId); + /** * Finds all targets of the provided {@link RolloutGroup} that have no * Action for the RolloutGroup. diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetTagManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetTagManagement.java index a4fc90e62a..03724ee39c 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetTagManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetTagManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetTypeManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetTypeManagement.java index fda8df5591..52b2410366 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetTypeManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TargetTypeManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java index 11a7b21576..523a6821dd 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TenantStatsManagement.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TenantStatsManagement.java index 6f89a83aee..519360a8aa 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TenantStatsManagement.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/TenantStatsManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/UpdateMode.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/UpdateMode.java index 3b245d40b4..80ddbed31c 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/UpdateMode.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/UpdateMode.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ValidString.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ValidString.java index 1a891620cd..97547a766a 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ValidString.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ValidString.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ValidStringValidator.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ValidStringValidator.java index 879eaeea53..a0eaab1908 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ValidStringValidator.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/ValidStringValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/autoassign/AutoAssignExecutor.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/autoassign/AutoAssignExecutor.java index 16d52bd3cd..e750298370 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/autoassign/AutoAssignExecutor.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/autoassign/AutoAssignExecutor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.autoassign; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/ActionStatusBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/ActionStatusBuilder.java index 9776b544c2..754bbbb408 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/ActionStatusBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/ActionStatusBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/ActionStatusCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/ActionStatusCreate.java index b3973dd87c..80121fd0c6 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/ActionStatusCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/ActionStatusCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/AutoAssignDistributionSetUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/AutoAssignDistributionSetUpdate.java index d26dc04942..003f0f4eeb 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/AutoAssignDistributionSetUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/AutoAssignDistributionSetUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetBuilder.java index 41a48b510c..07965c68f6 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetCreate.java index e9e03016d0..209602b7e8 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeBuilder.java index d2c41f2ecb..696e7a8ad5 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeCreate.java index 28cd7ff7c8..ca80a3727e 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeUpdate.java index 5f423e7e15..92340a19e7 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetTypeUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetUpdate.java index e3bf768efd..61b59ae782 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/DistributionSetUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutBuilder.java index 7f25eca3b2..32b7a48cc6 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutCreate.java index f8cd2e6b21..b4b7487a32 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutGroupBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutGroupBuilder.java index 65681f72eb..632d74d662 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutGroupBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutGroupBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutGroupCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutGroupCreate.java index 46a572b353..adbf8cc36f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutGroupCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutGroupCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutUpdate.java index 8c1a768abd..6d78677a6f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/RolloutUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleBuilder.java index 0f6272d7a8..d6ada16c0e 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleCreate.java index 552c418552..10d44a32da 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataBuilder.java index b4a7487443..2cc0704fdd 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataCreate.java index 3dee4f0945..90fafa85cb 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataUpdate.java index 9a3734f60f..2cdbabf060 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleMetadataUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeBuilder.java index 1e2dd389d8..d18a47b542 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeCreate.java index 336e2de19d..569aa96e75 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeUpdate.java index 4fe6a4e219..d1733d9376 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleTypeUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleUpdate.java index f0939036dc..94073ffcdf 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/SoftwareModuleUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagBuilder.java index 9b04696626..9f9c0a927c 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagCreate.java index ac7ef521d2..b8b21c5340 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagUpdate.java index 1b01c1ac34..e45172f8c4 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TagUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetBuilder.java index 00cb9f5935..78260a0ad1 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetCreate.java index 9af7463910..88a00b64bf 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryBuilder.java index 8dd14bdc85..8e0964a30f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryCreate.java index 572386751c..3cc51103c1 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryUpdate.java index 601f627154..3b61a501df 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetFilterQueryUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeBuilder.java index fa17a67e8b..6208c98e0f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeCreate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeCreate.java index c6770c6555..37441500f0 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeCreate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeUpdate.java index dca751247b..c3101badb7 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetTypeUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetUpdate.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetUpdate.java index f7fc03c5ff..f0d95a5833 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetUpdate.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/builder/TargetUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/ApplicationEventFilter.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/ApplicationEventFilter.java index 1d1c964e33..5d5437dccd 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/ApplicationEventFilter.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/ApplicationEventFilter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/CustomEvents.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/CustomEvents.java index c723dd6848..d2476b04ec 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/CustomEvents.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/CustomEvents.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/TenantAwareEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/TenantAwareEvent.java index 90c228b4f1..60e17c473d 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/TenantAwareEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/TenantAwareEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityCreatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityCreatedEvent.java index 34e453b2f4..3f0533c4fa 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityCreatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityCreatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityDeletedEvent.java index 46501eb97f..fe40792240 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityDeletedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityIdEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityIdEvent.java index fa9cc5a54c..eaa27bdf8d 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityIdEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityIdEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityUpdatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityUpdatedEvent.java index 908ea4a92c..f28f47cffc 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityUpdatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/entity/EntityUpdatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/AbstractAssignmentEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/AbstractAssignmentEvent.java index e026063210..ab8bf43bb9 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/AbstractAssignmentEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/AbstractAssignmentEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/CancelTargetAssignmentEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/CancelTargetAssignmentEvent.java index 3050216e9b..5eaa04e4ac 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/CancelTargetAssignmentEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/CancelTargetAssignmentEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetDeletedEvent.java index 92dd7d2992..25590edc18 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetDeletedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTagDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTagDeletedEvent.java index f129cc33ab..02be84e696 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTagDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTagDeletedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTypeDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTypeDeletedEvent.java index c228567a02..b16fc67d4f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTypeDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DistributionSetTypeDeletedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DownloadProgressEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DownloadProgressEvent.java index 97b4bbf519..c4d3efa1e2 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DownloadProgressEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/DownloadProgressEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/EventEntityManager.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/EventEntityManager.java index d6cd7d2e1b..4faeb81cfe 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/EventEntityManager.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/EventEntityManager.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/EventEntityManagerHolder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/EventEntityManagerHolder.java index 9c02b48eb6..cab39718d0 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/EventEntityManagerHolder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/EventEntityManagerHolder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/MultiActionAssignEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/MultiActionAssignEvent.java index 5411773dd6..c8e3a1737f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/MultiActionAssignEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/MultiActionAssignEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/MultiActionCancelEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/MultiActionCancelEvent.java index c8e1a26bff..8bd2df8580 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/MultiActionCancelEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/MultiActionCancelEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/MultiActionEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/MultiActionEvent.java index a0f982b2d9..f94d924986 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/MultiActionEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/MultiActionEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEvent.java index c08559cef7..a30ebafafb 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RemoteTenantAwareEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RemoteTenantAwareEvent.java index 739f56c73f..ac66358b48 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RemoteTenantAwareEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RemoteTenantAwareEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutDeletedEvent.java index 5cdeb939e4..e2aed91c99 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutDeletedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutGroupDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutGroupDeletedEvent.java index 91830bea70..e96d0efec6 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutGroupDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutGroupDeletedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutStoppedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutStoppedEvent.java index 8c4a10cf74..df89a7dc8e 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutStoppedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/RolloutStoppedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleDeletedEvent.java index 97b84e6135..98c8cf60cf 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleDeletedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleTypeDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleTypeDeletedEvent.java index 4ae5530cc2..36840a260e 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleTypeDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/SoftwareModuleTypeDeletedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetAssignDistributionSetEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetAssignDistributionSetEvent.java index 2dbfb669ec..4c2a6484bb 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetAssignDistributionSetEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetAssignDistributionSetEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetAttributesRequestedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetAttributesRequestedEvent.java index b09d79cd02..4d21439918 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetAttributesRequestedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetAttributesRequestedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetDeletedEvent.java index f91c557900..ebe8b10180 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetDeletedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetFilterQueryDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetFilterQueryDeletedEvent.java index bb8ce08c98..5d4a0b4b05 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetFilterQueryDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetFilterQueryDeletedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetPollEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetPollEvent.java index bfd6fc66aa..b829dffb7d 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetPollEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetPollEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTagDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTagDeletedEvent.java index a5d7c5950b..8ff2665c24 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTagDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTagDeletedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTypeDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTypeDeletedEvent.java index c430c1dadb..9436953fe2 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTypeDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TargetTypeDeletedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TenantConfigurationDeletedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TenantConfigurationDeletedEvent.java index 000978a524..6ec859f805 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TenantConfigurationDeletedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/TenantConfigurationDeletedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractActionEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractActionEvent.java index b157acadb0..b4ac425c53 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractActionEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractActionEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRolloutGroupEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRolloutGroupEvent.java index 41d177f111..3222514bce 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRolloutGroupEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRolloutGroupEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionCreatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionCreatedEvent.java index 681fd987f2..7bb5ff217a 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionCreatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionCreatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionUpdatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionUpdatedEvent.java index 6ebfda76a6..f58dd0b61c 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionUpdatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionUpdatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetCreatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetCreatedEvent.java index 3ee471fa3a..d10e42a29d 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetCreatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetCreatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagCreatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagCreatedEvent.java index 8992165c25..8cef7c7d47 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagCreatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagCreatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagUpdatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagUpdatedEvent.java index 3294d25e72..0b2751a228 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagUpdatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagUpdatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTypeCreatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTypeCreatedEvent.java index 92e03318f6..70d451b03a 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTypeCreatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTypeCreatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTypeUpdatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTypeUpdatedEvent.java index 118ccb7e25..ee9c4c38f9 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTypeUpdatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTypeUpdatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetUpdatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetUpdatedEvent.java index d57fa48888..388e5ecb84 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetUpdatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetUpdatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RemoteEntityEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RemoteEntityEvent.java index 312a047566..1ff9a8c231 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RemoteEntityEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RemoteEntityEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutCreatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutCreatedEvent.java index 25afab56ca..f5839f1f76 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutCreatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutCreatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupCreatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupCreatedEvent.java index 02eb2c8bbf..d743d9bb27 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupCreatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupCreatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupUpdatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupUpdatedEvent.java index 52d4c12c8d..4305e67fd3 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupUpdatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupUpdatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutUpdatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutUpdatedEvent.java index 63f4a9fdf1..c8b05ecf5a 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutUpdatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutUpdatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleCreatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleCreatedEvent.java index 336824875d..0388950860 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleCreatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleCreatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleTypeCreatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleTypeCreatedEvent.java index 11e2327d7e..ac6d44b0fe 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleTypeCreatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleTypeCreatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleTypeUpdatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleTypeUpdatedEvent.java index ca4f07b712..cb81ab9d9d 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleTypeUpdatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleTypeUpdatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleUpdatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleUpdatedEvent.java index d8c3d80806..abc56f7a0f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleUpdatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleUpdatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetCreatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetCreatedEvent.java index d50082ab0c..74561a5ab2 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetCreatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetCreatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetFilterQueryCreatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetFilterQueryCreatedEvent.java index a5be977a2b..96cb8afd14 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetFilterQueryCreatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetFilterQueryCreatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetFilterQueryUpdatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetFilterQueryUpdatedEvent.java index c3e1b9fb68..c94c34bc18 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetFilterQueryUpdatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetFilterQueryUpdatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagCreatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagCreatedEvent.java index 87b9ba2bce..20d320294f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagCreatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagCreatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagUpdatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagUpdatedEvent.java index beb38a9dee..108e801ed1 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagUpdatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagUpdatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTypeCreatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTypeCreatedEvent.java index 12c917b5c2..069e98d03b 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTypeCreatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTypeCreatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTypeUpdatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTypeUpdatedEvent.java index f001cb25a4..e2b90d4dab 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTypeUpdatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTypeUpdatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetUpdatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetUpdatedEvent.java index 610e6059f7..798fb8d89f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetUpdatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetUpdatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TenantConfigurationCreatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TenantConfigurationCreatedEvent.java index 76c132c5d2..e5a83d2671 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TenantConfigurationCreatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TenantConfigurationCreatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TenantConfigurationUpdatedEvent.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TenantConfigurationUpdatedEvent.java index f29176351e..b61790e3c2 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TenantConfigurationUpdatedEvent.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/event/remote/entity/TenantConfigurationUpdatedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactBinaryNoLongerExistsException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactBinaryNoLongerExistsException.java index b18d283260..a7155ca0e2 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactBinaryNoLongerExistsException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactBinaryNoLongerExistsException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactBinaryNotFoundException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactBinaryNotFoundException.java index a1ad2ee41a..ec69c6f523 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactBinaryNotFoundException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactBinaryNotFoundException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactDeleteFailedException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactDeleteFailedException.java index b4c76c1bf7..2dbf37d08d 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactDeleteFailedException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactDeleteFailedException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactEncryptionFailedException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactEncryptionFailedException.java index df2e1b04fb..57cacb34c1 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactEncryptionFailedException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactEncryptionFailedException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactEncryptionUnsupportedException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactEncryptionUnsupportedException.java index 30a2caa6aa..cfd745d5a1 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactEncryptionUnsupportedException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactEncryptionUnsupportedException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactUploadFailedException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactUploadFailedException.java index 96331e4007..2baa2a398b 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactUploadFailedException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ArtifactUploadFailedException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/AssignmentQuotaExceededException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/AssignmentQuotaExceededException.java index 33b604fa9b..9dedb6ae0f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/AssignmentQuotaExceededException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/AssignmentQuotaExceededException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/AutoConfirmationAlreadyActiveException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/AutoConfirmationAlreadyActiveException.java index 10cc73fb79..8bd41d2cc5 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/AutoConfirmationAlreadyActiveException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/AutoConfirmationAlreadyActiveException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/CancelActionNotAllowedException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/CancelActionNotAllowedException.java index df066793f3..4bd5400d60 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/CancelActionNotAllowedException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/CancelActionNotAllowedException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ConcurrentModificationException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ConcurrentModificationException.java index e1fd9651b6..e33bc4c52c 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ConcurrentModificationException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ConcurrentModificationException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/DistributionSetTypeUndefinedException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/DistributionSetTypeUndefinedException.java index 361e918b5e..db371162f0 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/DistributionSetTypeUndefinedException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/DistributionSetTypeUndefinedException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityAlreadyExistsException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityAlreadyExistsException.java index 238758388f..7b68c11035 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityAlreadyExistsException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityAlreadyExistsException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityNotFoundException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityNotFoundException.java index c292a65765..326a25a47c 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityNotFoundException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityNotFoundException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityReadOnlyException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityReadOnlyException.java index 1b548d8be4..d90a9d79ff 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityReadOnlyException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/EntityReadOnlyException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/FileSizeQuotaExceededException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/FileSizeQuotaExceededException.java index 87a583021c..8080fa2718 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/FileSizeQuotaExceededException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/FileSizeQuotaExceededException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ForceQuitActionNotAllowedException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ForceQuitActionNotAllowedException.java index 244211999d..5b0d43dc01 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ForceQuitActionNotAllowedException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ForceQuitActionNotAllowedException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/IncompatibleTargetTypeException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/IncompatibleTargetTypeException.java index e8e31d49a8..7a90b0eb51 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/IncompatibleTargetTypeException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/IncompatibleTargetTypeException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/IncompleteDistributionSetException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/IncompleteDistributionSetException.java index 3ce9624bcd..fdc88bb3a2 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/IncompleteDistributionSetException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/IncompleteDistributionSetException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InsufficientPermissionException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InsufficientPermissionException.java index ef9ff624b8..1b2c7722a3 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InsufficientPermissionException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InsufficientPermissionException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidAutoAssignActionTypeException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidAutoAssignActionTypeException.java index 6db9b901b4..25659828e4 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidAutoAssignActionTypeException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidAutoAssignActionTypeException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidConfirmationFeedbackException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidConfirmationFeedbackException.java index d2b7fdee31..04f022584a 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidConfirmationFeedbackException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidConfirmationFeedbackException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidDistributionSetException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidDistributionSetException.java index 7b065e1ba4..224703dc9f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidDistributionSetException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidDistributionSetException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidMD5HashException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidMD5HashException.java index aa6974b57e..91de430402 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidMD5HashException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidMD5HashException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidMaintenanceScheduleException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidMaintenanceScheduleException.java index 7aa68bac46..978e0997aa 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidMaintenanceScheduleException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidMaintenanceScheduleException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) Siemens AG, 2018 + * Copyright (c) 2018 Siemens AG * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidSHA1HashException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidSHA1HashException.java index 7153081e1b..8b0633103e 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidSHA1HashException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidSHA1HashException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidSHA256HashException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidSHA256HashException.java index 297951ad10..cf46f6b499 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidSHA256HashException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidSHA256HashException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidTargetAddressException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidTargetAddressException.java index 6b5a5333d4..62f82dc73d 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidTargetAddressException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidTargetAddressException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidTargetAttributeException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidTargetAttributeException.java index ca704156c2..fc66d1785a 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidTargetAttributeException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidTargetAttributeException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidTenantConfigurationKeyException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidTenantConfigurationKeyException.java index a7d5300162..89c0e8f991 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidTenantConfigurationKeyException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/InvalidTenantConfigurationKeyException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/MethodNotSupportedException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/MethodNotSupportedException.java index fd96862189..ade5491c2c 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/MethodNotSupportedException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/MethodNotSupportedException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/MultiAssignmentIsNotEnabledException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/MultiAssignmentIsNotEnabledException.java index 49e641db95..f6be69d905 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/MultiAssignmentIsNotEnabledException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/MultiAssignmentIsNotEnabledException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/NoWeightProvidedInMultiAssignmentModeException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/NoWeightProvidedInMultiAssignmentModeException.java index 2c3758301c..3d0c337cb9 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/NoWeightProvidedInMultiAssignmentModeException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/NoWeightProvidedInMultiAssignmentModeException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/RSQLParameterSyntaxException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/RSQLParameterSyntaxException.java index 226ccaecf9..a03f617988 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/RSQLParameterSyntaxException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/RSQLParameterSyntaxException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/RSQLParameterUnsupportedFieldException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/RSQLParameterUnsupportedFieldException.java index 95ba8502fd..6aff2b55b5 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/RSQLParameterUnsupportedFieldException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/RSQLParameterUnsupportedFieldException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/RolloutIllegalStateException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/RolloutIllegalStateException.java index 468824babc..fda2c30418 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/RolloutIllegalStateException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/RolloutIllegalStateException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/SoftwareModuleNotAssignedToTargetException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/SoftwareModuleNotAssignedToTargetException.java index af4e1ec21a..cf0e08df47 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/SoftwareModuleNotAssignedToTargetException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/SoftwareModuleNotAssignedToTargetException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/SoftwareModuleTypeNotInDistributionSetTypeException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/SoftwareModuleTypeNotInDistributionSetTypeException.java index edfb8f4368..a244f79fc1 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/SoftwareModuleTypeNotInDistributionSetTypeException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/SoftwareModuleTypeNotInDistributionSetTypeException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/StopRolloutException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/StopRolloutException.java index 053fdaeafc..8dba6ac49c 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/StopRolloutException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/StopRolloutException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/StorageQuotaExceededException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/StorageQuotaExceededException.java index 850c90863b..da56278f1b 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/StorageQuotaExceededException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/StorageQuotaExceededException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/TargetTypeInUseException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/TargetTypeInUseException.java index e27ac37352..49b0e388b4 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/TargetTypeInUseException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/TargetTypeInUseException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/TenantConfigurationValueChangeNotAllowedException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/TenantConfigurationValueChangeNotAllowedException.java index 8471179d1c..f4661f9656 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/TenantConfigurationValueChangeNotAllowedException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/TenantConfigurationValueChangeNotAllowedException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/TenantNotExistException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/TenantNotExistException.java index 0ccb95d10e..39b74faf4c 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/TenantNotExistException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/TenantNotExistException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/UnsupportedSoftwareModuleForThisDistributionSetException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/UnsupportedSoftwareModuleForThisDistributionSetException.java index 9cfeca4466..cdb2459bd4 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/UnsupportedSoftwareModuleForThisDistributionSetException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/UnsupportedSoftwareModuleForThisDistributionSetException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.exception; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/AbstractAssignmentResult.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/AbstractAssignmentResult.java index 45d3959095..8560d6f287 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/AbstractAssignmentResult.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/AbstractAssignmentResult.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Action.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Action.java index 14c097187a..f0799b1646 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Action.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Action.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ActionProperties.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ActionProperties.java index b82b14b537..b8e1c8fefe 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ActionProperties.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ActionProperties.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ActionStatus.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ActionStatus.java index c7f6416f03..7a8eeb60f7 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ActionStatus.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ActionStatus.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Artifact.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Artifact.java index e3960f3ec8..7f66bdd81a 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Artifact.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Artifact.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ArtifactUpload.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ArtifactUpload.java index 8407c13298..dd4441cbf6 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ArtifactUpload.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/ArtifactUpload.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/AssignedSoftwareModule.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/AssignedSoftwareModule.java index 8253502ee1..4ab9027e58 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/AssignedSoftwareModule.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/AssignedSoftwareModule.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/AutoConfirmationStatus.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/AutoConfirmationStatus.java index 22c780a4c1..ff1abcb08f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/AutoConfirmationStatus.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/AutoConfirmationStatus.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/BaseEntity.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/BaseEntity.java index c3c031d7da..7fd3d0ffc3 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/BaseEntity.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/BaseEntity.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DeploymentRequest.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DeploymentRequest.java index f51b1ccd22..aa03b42502 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DeploymentRequest.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DeploymentRequest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DeploymentRequestBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DeploymentRequestBuilder.java index 1f5e2be0ea..6291be9710 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DeploymentRequestBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DeploymentRequestBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java index 49e38fac29..8a98f2760b 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSet.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetAssignmentResult.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetAssignmentResult.java index 88ee6cc25c..1e903d52da 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetAssignmentResult.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetAssignmentResult.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetFilter.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetFilter.java index f1c81a35d4..29b1ee5c05 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetFilter.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetFilter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetInvalidation.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetInvalidation.java index 91bf451505..e3b7b21671 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetInvalidation.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetInvalidation.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetInvalidationCount.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetInvalidationCount.java index bdd89e9c6a..d871acddda 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetInvalidationCount.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetInvalidationCount.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetMetadata.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetMetadata.java index 6e43d18cf7..fb374db73c 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetMetadata.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetMetadata.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTag.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTag.java index aec150152b..7100f6b5bf 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTag.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTag.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTagAssignmentResult.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTagAssignmentResult.java index d8e33843bb..fc2f31a604 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTagAssignmentResult.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetTagAssignmentResult.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetType.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetType.java index 1b36d8927c..662d31e2ad 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetType.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/MetaData.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/MetaData.java index d8433609b9..5e2b2c33e8 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/MetaData.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/MetaData.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/NamedEntity.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/NamedEntity.java index 80c8ea62de..cd269f7304 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/NamedEntity.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/NamedEntity.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/NamedVersionedEntity.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/NamedVersionedEntity.java index 3072bafbe6..1efc9c51f1 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/NamedVersionedEntity.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/NamedVersionedEntity.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/PollStatus.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/PollStatus.java index 876020dbd9..88ac7d1c3d 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/PollStatus.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/PollStatus.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RepositoryModelConstants.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RepositoryModelConstants.java index 66806915ae..4816d3e383 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RepositoryModelConstants.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RepositoryModelConstants.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Rollout.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Rollout.java index 2fac6b9ba4..45691c3986 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Rollout.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Rollout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroup.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroup.java index ac5ee31fd3..1c7ebbbfb6 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroup.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroup.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroupConditionBuilder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroupConditionBuilder.java index 821da68eba..a5dbd2c93d 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroupConditionBuilder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroupConditionBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroupConditions.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroupConditions.java index 618e93c4e4..b71f0df152 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroupConditions.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroupConditions.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroupsValidation.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroupsValidation.java index 5e5821d1cc..9e03e9c881 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroupsValidation.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/RolloutGroupsValidation.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModule.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModule.java index e00086a2d1..4cae47e438 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModule.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModule.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModuleMetadata.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModuleMetadata.java index 23058447bd..42fd93ab60 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModuleMetadata.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModuleMetadata.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModuleType.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModuleType.java index 12e7a14441..966f115492 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModuleType.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModuleType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Statistic.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Statistic.java index ced2e29f3c..30c0df3319 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Statistic.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Statistic.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2023 Bosch.IO GmbH and others. + * Copyright (c) 2023 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Tag.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Tag.java index 9e6c0ac14b..657a6f6d2d 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Tag.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Tag.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Target.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Target.java index e3db4d9110..3db6efaf46 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Target.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Target.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetFilterQuery.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetFilterQuery.java index f901ca0ff2..b71e5504df 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetFilterQuery.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetFilterQuery.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetMetadata.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetMetadata.java index 06a9ab14b5..cca9b85dd8 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetMetadata.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetMetadata.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTag.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTag.java index 9923c194ee..2bca869775 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTag.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTag.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTagAssignmentResult.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTagAssignmentResult.java index 207b88a4bc..f2768e590f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTagAssignmentResult.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTagAssignmentResult.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetType.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetType.java index edb71520d9..ab6152e759 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetType.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTypeAssignmentResult.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTypeAssignmentResult.java index 379f059d37..32fcc8da68 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTypeAssignmentResult.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetTypeAssignmentResult.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetUpdateStatus.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetUpdateStatus.java index b6404c6f8d..da1000c5a7 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetUpdateStatus.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetUpdateStatus.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetWithActionStatus.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetWithActionStatus.java index b2d5efa83b..1a0e18b7fc 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetWithActionStatus.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetWithActionStatus.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetWithActionType.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetWithActionType.java index ada3f27b42..1678101d7c 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetWithActionType.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TargetWithActionType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantAwareBaseEntity.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantAwareBaseEntity.java index b0766dd5a3..9d96c82702 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantAwareBaseEntity.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantAwareBaseEntity.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantConfiguration.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantConfiguration.java index 2cb5cb4692..07120546fd 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantConfiguration.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantConfigurationValue.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantConfigurationValue.java index dbb242feca..81670f5f82 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantConfigurationValue.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantConfigurationValue.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java index c19364ec0e..f63f11f723 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantMetaData.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TotalTargetCountActionStatus.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TotalTargetCountActionStatus.java index 9fabef663f..5a3735d392 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TotalTargetCountActionStatus.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TotalTargetCountActionStatus.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TotalTargetCountStatus.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TotalTargetCountStatus.java index ca35e73a33..b8229d2826 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TotalTargetCountStatus.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TotalTargetCountStatus.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Type.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Type.java index 90c0134b2f..73424f9a64 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Type.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/Type.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/report/model/SystemUsageReport.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/report/model/SystemUsageReport.java index b747947847..db92955819 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/report/model/SystemUsageReport.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/report/model/SystemUsageReport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.report.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/report/model/SystemUsageReportWithTenants.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/report/model/SystemUsageReportWithTenants.java index 9919986cc5..4a63917d6a 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/report/model/SystemUsageReportWithTenants.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/report/model/SystemUsageReportWithTenants.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.report.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/report/model/TenantUsage.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/report/model/TenantUsage.java index c85efa19ea..2b7bc0ac98 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/report/model/TenantUsage.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/report/model/TenantUsage.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.report.model; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlValidationOracle.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlValidationOracle.java index bb4b16817d..412c913f06 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlValidationOracle.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlValidationOracle.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.rsql; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlVisitorFactory.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlVisitorFactory.java index ab93f87c5a..49958124ea 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlVisitorFactory.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlVisitorFactory.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.rsql; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlVisitorFactoryHolder.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlVisitorFactoryHolder.java index 98f0d8fe56..2b108b00e1 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlVisitorFactoryHolder.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/RsqlVisitorFactoryHolder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.rsql; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/SuggestToken.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/SuggestToken.java index db560f17f5..facb1b60cc 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/SuggestToken.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/SuggestToken.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.rsql; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/SuggestionContext.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/SuggestionContext.java index 2dd6531a6b..fb9538c02e 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/SuggestionContext.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/SuggestionContext.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.rsql; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/SyntaxErrorContext.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/SyntaxErrorContext.java index 107ff755a8..24d535ebd6 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/SyntaxErrorContext.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/SyntaxErrorContext.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.rsql; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/ValidationOracleContext.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/ValidationOracleContext.java index a6a71cf350..80fb4b04d5 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/ValidationOracleContext.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/ValidationOracleContext.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.rsql; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/VirtualPropertyReplacer.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/VirtualPropertyReplacer.java index 366e61ec36..82e57955cb 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/VirtualPropertyReplacer.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/rsql/VirtualPropertyReplacer.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.rsql; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/DurationHelper.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/DurationHelper.java index 6e2434a3c9..80739c06f3 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/DurationHelper.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/DurationHelper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.tenancy.configuration; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationProperties.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationProperties.java index c442ef55cc..f3ef395250 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationProperties.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationProperties.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.tenancy.configuration; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationBooleanValidator.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationBooleanValidator.java index 8836d85789..962f23efea 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationBooleanValidator.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationBooleanValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.tenancy.configuration.validator; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationIntegerValidator.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationIntegerValidator.java index 6cd8899b48..31829aa4c4 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationIntegerValidator.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationIntegerValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) Siemens AG, 2018 + * Copyright (c) 2018 Siemens AG * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.tenancy.configuration.validator; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationLongValidator.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationLongValidator.java index d298e98d7d..a451e8336b 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationLongValidator.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationLongValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.tenancy.configuration.validator; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationPollingDurationValidator.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationPollingDurationValidator.java index 376ba8877d..7a515f8def 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationPollingDurationValidator.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationPollingDurationValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.tenancy.configuration.validator; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationStringValidator.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationStringValidator.java index fc427f4ac5..875d3fb962 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationStringValidator.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationStringValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.tenancy.configuration.validator; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationValidator.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationValidator.java index bb61f1ec5b..44e3462f63 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationValidator.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.tenancy.configuration.validator; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationValidatorException.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationValidatorException.java index 07ff99820d..7ecd18adf5 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationValidatorException.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationValidatorException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.tenancy.configuration.validator; diff --git a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/utils/TenantConfigHelper.java b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/utils/TenantConfigHelper.java index 5e4c28034e..ee6508f581 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/utils/TenantConfigHelper.java +++ b/hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/utils/TenantConfigHelper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.utils; diff --git a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/ArtifactEncryptionServiceTest.java b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/ArtifactEncryptionServiceTest.java index 682dca5909..dee99c4f7f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/ArtifactEncryptionServiceTest.java +++ b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/ArtifactEncryptionServiceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelperTest.java b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelperTest.java index 5f6866bea4..ffb44767ec 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelperTest.java +++ b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/MaintenanceScheduleHelperTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RegexCharTest.java b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RegexCharTest.java index 8e577c7491..5b9193ea54 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RegexCharTest.java +++ b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RegexCharTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java index 2f4e808022..beb4c57d8f 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java +++ b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/RepositoryManagementMethodPreAuthorizeAnnotatedTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; @@ -40,7 +41,7 @@ public class RepositoryManagementMethodPreAuthorizeAnnotatedTest { } @Test - @Description("Verfies that repository methods are @PreAuthorize annotated") + @Description("Verifies that repository methods are @PreAuthorize annotated") public void repositoryManagementMethodsArePreAuthorizedAnnotated() throws ClassNotFoundException, URISyntaxException, IOException { final List> findInterfacesInPackage = findInterfacesInPackage(getClass().getPackage(), @@ -48,10 +49,10 @@ public void repositoryManagementMethodsArePreAuthorizedAnnotated() assertThat(findInterfacesInPackage).isNotEmpty(); for (final Class interfaceToCheck : findInterfacesInPackage) { - assertDeclaredMethodsContainsPreAuthorizeAnnotaions(interfaceToCheck); + assertDeclaredMethodsContainsPreAuthorizeAnnotations(interfaceToCheck); } - // all exclusion should be used, otherwise the method exlusion should be + // all exclusion should be used, otherwise the method exclusion should be // cleaned up again assertThat(METHOD_SECURITY_EXCLUSION).isEmpty(); } @@ -65,7 +66,7 @@ public void repositoryManagementMethodsArePreAuthorizedAnnotated() * @param clazz * the class to retrieve the public declared methods */ - private static void assertDeclaredMethodsContainsPreAuthorizeAnnotaions(final Class clazz) { + private static void assertDeclaredMethodsContainsPreAuthorizeAnnotations(final Class clazz) { final Method[] declaredMethods = clazz.getDeclaredMethods(); for (final Method method : declaredMethods) { final boolean methodExcluded = METHOD_SECURITY_EXCLUSION.contains(method); diff --git a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/model/TotalTargetCountStatusTest.java b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/model/TotalTargetCountStatusTest.java index 089243bfb5..85b8ef014a 100644 --- a/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/model/TotalTargetCountStatusTest.java +++ b/hawkbit-repository/hawkbit-repository-api/src/test/java/org/eclipse/hawkbit/repository/model/TotalTargetCountStatusTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model; diff --git a/hawkbit-repository/hawkbit-repository-core/pom.xml b/hawkbit-repository/hawkbit-repository-core/pom.xml index 0805fd302c..3ef2996ff1 100644 --- a/hawkbit-repository/hawkbit-repository-core/pom.xml +++ b/hawkbit-repository/hawkbit-repository-core/pom.xml @@ -1,11 +1,12 @@ diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/event/BusProtoStuffMessageConverter.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/event/BusProtoStuffMessageConverter.java index 7884e98085..a46dd8a93c 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/event/BusProtoStuffMessageConverter.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/event/BusProtoStuffMessageConverter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.event; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/event/EventType.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/event/EventType.java index 927652d0bd..bb3eb0d2de 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/event/EventType.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/event/EventType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.event; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/PropertiesQuotaManagement.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/PropertiesQuotaManagement.java index 4ab876288a..69c15fbf4d 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/PropertiesQuotaManagement.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/PropertiesQuotaManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RepositoryDefaultConfiguration.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RepositoryDefaultConfiguration.java index 2638559df3..2e30b01c95 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RepositoryDefaultConfiguration.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RepositoryDefaultConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RolloutApprovalStrategy.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RolloutApprovalStrategy.java index 9008db19a2..e030aea309 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RolloutApprovalStrategy.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RolloutApprovalStrategy.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RolloutHelper.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RolloutHelper.java index e215bca480..9680949f61 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RolloutHelper.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RolloutHelper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; @@ -228,6 +229,9 @@ public static String getGroupTargetFilter(final String baseFilter, final Rollout if (StringUtils.isEmpty(group.getTargetFilterQuery())) { return baseFilter; } + if (isRolloutRetried(baseFilter)) { + return baseFilter; + } return concatAndTargetFilters(baseFilter, group.getTargetFilterQuery()); } @@ -252,4 +256,12 @@ public static void checkIfRolloutCanStarted(final Rollout rollout, final Rollout + rollout.getStatus().name().toLowerCase()); } } + + public static boolean isRolloutRetried(final String targetFilter) { + return targetFilter.contains("failedrollout"); + } + + public static String getIdFromRetriedTargetFilter(final String targetFilter) { + return targetFilter.substring("failedrollout==".length()); + } } diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RolloutStatusCache.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RolloutStatusCache.java index 79c51af668..f7e208426c 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RolloutStatusCache.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/RolloutStatusCache.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/TimestampCalculator.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/TimestampCalculator.java index 8fada49a3b..186c6fc6ec 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/TimestampCalculator.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/TimestampCalculator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractActionStatusCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractActionStatusCreate.java index 7dd78c5638..da1e568516 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractActionStatusCreate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractActionStatusCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractBaseEntityBuilder.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractBaseEntityBuilder.java index 5fd17ab38b..13f910981c 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractBaseEntityBuilder.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractBaseEntityBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractDistributionSetTypeUpdateCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractDistributionSetTypeUpdateCreate.java index dd6c8d4590..cd70337044 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractDistributionSetTypeUpdateCreate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractDistributionSetTypeUpdateCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractDistributionSetUpdateCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractDistributionSetUpdateCreate.java index ae6e25b4af..6cf242efcd 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractDistributionSetUpdateCreate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractDistributionSetUpdateCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractMetadataUpdateCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractMetadataUpdateCreate.java index c9c86eb051..26af54642c 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractMetadataUpdateCreate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractMetadataUpdateCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractNamedEntityBuilder.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractNamedEntityBuilder.java index 8ae8d36062..6ca9da487a 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractNamedEntityBuilder.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractNamedEntityBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractRolloutGroupCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractRolloutGroupCreate.java index cb2c01a9a1..b3ab2cbff0 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractRolloutGroupCreate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractRolloutGroupCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractRolloutUpdateCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractRolloutUpdateCreate.java index f43e374b6c..bd8507193f 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractRolloutUpdateCreate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractRolloutUpdateCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractSoftwareModuleMetadataUpdateCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractSoftwareModuleMetadataUpdateCreate.java index 5833bd8122..8bad2ca507 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractSoftwareModuleMetadataUpdateCreate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractSoftwareModuleMetadataUpdateCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractSoftwareModuleTypeUpdateCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractSoftwareModuleTypeUpdateCreate.java index 833769cb94..594ae0d9a5 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractSoftwareModuleTypeUpdateCreate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractSoftwareModuleTypeUpdateCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractSoftwareModuleUpdateCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractSoftwareModuleUpdateCreate.java index 936c983b96..72e7f628a8 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractSoftwareModuleUpdateCreate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractSoftwareModuleUpdateCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTagUpdateCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTagUpdateCreate.java index ba148c1926..07416e3161 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTagUpdateCreate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTagUpdateCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTargetFilterQueryUpdateCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTargetFilterQueryUpdateCreate.java index 926b6b4580..8223c44848 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTargetFilterQueryUpdateCreate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTargetFilterQueryUpdateCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTargetTypeUpdateCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTargetTypeUpdateCreate.java index 2a30d732f3..a1b65e0d9c 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTargetTypeUpdateCreate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTargetTypeUpdateCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTargetUpdateCreate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTargetUpdateCreate.java index 2e88a5e3ed..d84e724734 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTargetUpdateCreate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/AbstractTargetUpdateCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericDistributionSetTypeUpdate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericDistributionSetTypeUpdate.java index 1f255f84cf..2da56ed112 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericDistributionSetTypeUpdate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericDistributionSetTypeUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericDistributionSetUpdate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericDistributionSetUpdate.java index 4c66a21a71..68c2f94157 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericDistributionSetUpdate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericDistributionSetUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericRolloutUpdate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericRolloutUpdate.java index 2b26781751..3b2d327395 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericRolloutUpdate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericRolloutUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericSoftwareModuleMetadataUpdate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericSoftwareModuleMetadataUpdate.java index d05bece242..bd26860e55 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericSoftwareModuleMetadataUpdate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericSoftwareModuleMetadataUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericSoftwareModuleTypeUpdate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericSoftwareModuleTypeUpdate.java index 13ece37976..72bab12709 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericSoftwareModuleTypeUpdate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericSoftwareModuleTypeUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericSoftwareModuleUpdate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericSoftwareModuleUpdate.java index fdcf6b1ef5..c5c2a627da 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericSoftwareModuleUpdate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericSoftwareModuleUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericTagUpdate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericTagUpdate.java index a512b7aa62..8b3cc49c8f 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericTagUpdate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericTagUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericTargetFilterQueryUpdate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericTargetFilterQueryUpdate.java index 4c65f6b092..cb78950455 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericTargetFilterQueryUpdate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericTargetFilterQueryUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericTargetTypeUpdate.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericTargetTypeUpdate.java index b60d0e41f2..8802ca11ee 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericTargetTypeUpdate.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/builder/GenericTargetTypeUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.builder; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/EventPublisherHolder.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/EventPublisherHolder.java index 1b2e71f579..f87030efad 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/EventPublisherHolder.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/EventPublisherHolder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model.helper; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/SystemManagementHolder.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/SystemManagementHolder.java index d1327c6902..82caa0d615 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/SystemManagementHolder.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/SystemManagementHolder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model.helper; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/SystemSecurityContextHolder.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/SystemSecurityContextHolder.java index 7d005e9bca..ebf26983c3 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/SystemSecurityContextHolder.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/SystemSecurityContextHolder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model.helper; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/TenantConfigurationManagementHolder.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/TenantConfigurationManagementHolder.java index 700511db69..2d43be2458 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/TenantConfigurationManagementHolder.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/model/helper/TenantConfigurationManagementHolder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.model.helper; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/rsql/VirtualPropertyResolver.java b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/rsql/VirtualPropertyResolver.java index f924de1030..58174868bc 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/rsql/VirtualPropertyResolver.java +++ b/hawkbit-repository/hawkbit-repository-core/src/main/java/org/eclipse/hawkbit/repository/rsql/VirtualPropertyResolver.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.rsql; diff --git a/hawkbit-repository/hawkbit-repository-core/src/main/resources/hawkbit-repository-defaults.properties b/hawkbit-repository/hawkbit-repository-core/src/main/resources/hawkbit-repository-defaults.properties index 9fbe0cc5fe..cef277bca5 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/main/resources/hawkbit-repository-defaults.properties +++ b/hawkbit-repository/hawkbit-repository-core/src/main/resources/hawkbit-repository-defaults.properties @@ -1,13 +1,14 @@ # -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. +# Copyright (c) 2015 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # -# Defines the polling time for the controllers in HH:MM:SS notation +# Defines the polling time for the controllers in HH:MM:SS notation hawkbit.controller.pollingTime=00:05:00 hawkbit.controller.pollingOverdueTime=00:05:00 hawkbit.controller.maxPollingTime=23:59:59 diff --git a/hawkbit-repository/hawkbit-repository-core/src/test/java/org/eclipse/hawkbit/event/BusProtoStuffMessageConverterTest.java b/hawkbit-repository/hawkbit-repository-core/src/test/java/org/eclipse/hawkbit/event/BusProtoStuffMessageConverterTest.java index d665e04a20..fe6ae9bd4e 100644 --- a/hawkbit-repository/hawkbit-repository-core/src/test/java/org/eclipse/hawkbit/event/BusProtoStuffMessageConverterTest.java +++ b/hawkbit-repository/hawkbit-repository-core/src/test/java/org/eclipse/hawkbit/event/BusProtoStuffMessageConverterTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.event; diff --git a/hawkbit-repository/hawkbit-repository-jpa/pom.xml b/hawkbit-repository/hawkbit-repository-jpa/pom.xml index 5bc7a37cfe..c9f76ce4c4 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/pom.xml +++ b/hawkbit-repository/hawkbit-repository-jpa/pom.xml @@ -1,11 +1,12 @@ handleFinishedAndStoreInTargetStatus(final JpaAction action) { final JpaTarget target = (JpaTarget) action.getTarget(); action.setActive(false); - action.setStatus(Status.FINISHED); + action.setStatus(Action.Status.FINISHED); final JpaDistributionSet ds = (JpaDistributionSet) entityManager.merge(action.getDistributionSet()); target.setInstalledDistributionSet(ds); @@ -924,7 +924,7 @@ public Action registerRetrieved(final long actionId, final String message) { * @param message * for the status * @return the updated action in case the status has been changed to - * {@link Status#RETRIEVED} + * {@link Action.Status#RETRIEVED} */ private Action handleRegisterRetrieved(final Long actionId, final String message) { final JpaAction action = getActionAndThrowExceptionIfNotFound(actionId); @@ -951,17 +951,17 @@ private Action handleRegisterRetrieved(final Long actionId, final String message // retrieves after the other we don't want to store to protect to // overflood action status in // case controller retrieves a action multiple times. - if (resultList.isEmpty() || (Status.RETRIEVED != resultList.get(0)[1])) { + if (resultList.isEmpty() || (Action.Status.RETRIEVED != resultList.get(0)[1])) { // document that the status has been retrieved actionStatusRepository - .save(new JpaActionStatus(action, Status.RETRIEVED, System.currentTimeMillis(), message)); + .save(new JpaActionStatus(action, Action.Status.RETRIEVED, System.currentTimeMillis(), message)); // don't change the action status itself in case the action is in // canceling state otherwise // we modify the action status and the controller won't get the // cancel job anymore. if (!action.isCancelingOrCanceled()) { - action.setStatus(Status.RETRIEVED); + action.setStatus(Action.Status.RETRIEVED); return actionRepository.save(action); } } @@ -1102,7 +1102,7 @@ public boolean equals(final Object obj) { /** * Cancels given {@link Action} for this {@link Target}. The method will - * immediately add a {@link Status#CANCELED} status to the action. However, + * immediately add a {@link Action.Status#CANCELED} status to the action. However, * it might be possible that the controller will continue to work on the * cancellation. The controller needs to acknowledge or reject the * cancellation using {@link DdiRootController#postCancelActionFeedback}. @@ -1131,11 +1131,11 @@ public Action cancelAction(final long actionId) { } if (action.isActive()) { - LOG.debug("action ({}) was still active. Change to {}.", action, Status.CANCELING); - action.setStatus(Status.CANCELING); + LOG.debug("action ({}) was still active. Change to {}.", action, Action.Status.CANCELING); + action.setStatus(Action.Status.CANCELING); // document that the status has been retrieved - actionStatusRepository.save(new JpaActionStatus(action, Status.CANCELING, System.currentTimeMillis(), + actionStatusRepository.save(new JpaActionStatus(action, Action.Status.CANCELING, System.currentTimeMillis(), "manual cancelation requested")); final Action saveAction = actionRepository.save(action); cancelAssignDistributionSetEvent(action); @@ -1204,7 +1204,7 @@ public List findActionsOfTargetWithId(Long targetId) { .multiselect(actionRoot.get(JpaAction_.id)) .where(cb.and( cb.equal(actionRoot.get(JpaAction_.target).get(JpaTarget_.id), targetId), - cb.notEqual(actionRoot.get(JpaAction_.status), Status.ERROR) + cb.notEqual(actionRoot.get(JpaAction_.status), Action.Status.ERROR) )).orderBy(cb.desc(actionRoot.get(JpaAction_.createdAt))); return entityManager.createQuery(query).getResultList(); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDeploymentManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDeploymentManagement.java index 4494dd171f..7efb00b68d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDeploymentManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDeploymentManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; @@ -143,6 +144,7 @@ public class JpaDeploymentManagement extends JpaActionManagement implements Depl private final TenantAware tenantAware; private final Database database; private final RetryTemplate retryTemplate; + private final TargetManagement targetManagement; protected JpaDeploymentManagement(final EntityManager entityManager, final ActionRepository actionRepository, final DistributionSetManagement distributionSetManagement, final DistributionSetRepository distributionSetRepository, @@ -153,6 +155,7 @@ protected JpaDeploymentManagement(final EntityManager entityManager, final Actio final QuotaManagement quotaManagement, final SystemSecurityContext systemSecurityContext, final TenantAware tenantAware, final Database database, final RepositoryProperties repositoryProperties, final TargetManagement targetManagement) { + super(actionRepository, actionStatusRepository, quotaManagement, repositoryProperties); this.entityManager = entityManager; this.distributionSetRepository = distributionSetRepository; @@ -161,6 +164,7 @@ protected JpaDeploymentManagement(final EntityManager entityManager, final Actio this.auditorProvider = auditorProvider; this.virtualPropertyReplacer = virtualPropertyReplacer; this.txManager = txManager; + this.targetManagement = targetManagement; onlineDsAssignmentStrategy = new OnlineDsAssignmentStrategy(targetRepository, targetManagement, afterCommit, eventPublisherHolder, actionRepository, actionStatusRepository, quotaManagement, this::isMultiAssignmentsEnabled, this::isConfirmationFlowEnabled); @@ -1059,7 +1063,7 @@ public int deleteActionsByStatusAndLastModifiedBefore(final Set status, @Override public boolean hasPendingCancellations(final String controllerId) { return actionRepository.existsByTargetControllerIdAndStatusAndActiveIsTrue(controllerId, - Status.CANCELING); + Action.Status.CANCELING); } private static String getQueryForDeleteActionsByStatusAndLastModifiedBeforeString(final Database database) { diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetInvalidationManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetInvalidationManagement.java index cbe2018267..2d4961a078 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetInvalidationManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetInvalidationManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java index 73b6d589e6..7857ed5f95 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetTagManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetTagManagement.java index 4659601d0f..71d424a3d5 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetTagManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetTagManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetTypeManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetTypeManagement.java index 7b3ec81442..5f0fc233d5 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetTypeManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaDistributionSetTypeManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaEntityFactory.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaEntityFactory.java index ac16447085..7187d3c880 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaEntityFactory.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaEntityFactory.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaManagementHelper.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaManagementHelper.java index d2328c1682..fc05fce666 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaManagementHelper.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaManagementHelper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java index 49d6c321fa..5ba1b6088e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutExecutor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; @@ -54,7 +55,6 @@ import org.eclipse.hawkbit.tenancy.TenantAware; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Slice; @@ -528,10 +528,18 @@ private RolloutGroup fillRolloutGroupWithTargets(final JpaRollout rollout, final final List readyGroups = RolloutHelper.getGroupsByStatusIncludingGroup(rollout.getRolloutGroups(), RolloutGroupStatus.READY, group); - final long targetsInGroupFilter = DeploymentHelper.runInNewTransaction(txManager, + long targetsInGroupFilter; + if (!RolloutHelper.isRolloutRetried(rollout.getTargetFilterQuery())) { + targetsInGroupFilter = DeploymentHelper.runInNewTransaction(txManager, "countAllTargetsByTargetFilterQueryAndNotInRolloutGroups", count -> targetManagement.countByRsqlAndNotInRolloutGroupsAndCompatible(readyGroups, groupTargetFilter, - rollout.getDistributionSet().getType())); + rollout.getDistributionSet().getType())); + } else { + targetsInGroupFilter = DeploymentHelper.runInNewTransaction(txManager, + "countByFailedRolloutAndNotInRolloutGroupsAndCompatible", + count -> targetManagement.countByFailedRolloutAndNotInRolloutGroups(readyGroups, + RolloutHelper.getIdFromRetriedTargetFilter(rollout.getTargetFilterQuery()))); + } final long expectedInGroup = Math .round((double) (group.getTargetPercentage() / 100) * (double) targetsInGroupFilter); final long currentlyInGroup = DeploymentHelper.runInNewTransaction(txManager, @@ -550,7 +558,7 @@ private RolloutGroup fillRolloutGroupWithTargets(final JpaRollout rollout, final long targetsLeftToAdd = expectedInGroup - currentlyInGroup; do { - // Add up to maxTargetsPerTransaction of the left targets + // Add up to TRANSACTION_TARGETS of the left targets // In case a TransactionException is thrown this loop aborts targetsLeftToAdd -= assignTargetsToGroupInNewTransaction(rollout, group, groupTargetFilter, Math.min(maxTargetsPerTransaction, targetsLeftToAdd)); @@ -575,10 +583,17 @@ private Long assignTargetsToGroupInNewTransaction(final JpaRollout rollout, fina final PageRequest pageRequest = PageRequest.of(0, Math.toIntExact(limit)); final List readyGroups = RolloutHelper.getGroupsByStatusIncludingGroup(rollout.getRolloutGroups(), RolloutGroupStatus.READY, group); - final Slice targets = targetManagement.findByTargetFilterQueryAndNotInRolloutGroupsAndCompatible( + Slice targets; + if (!RolloutHelper.isRolloutRetried(rollout.getTargetFilterQuery())) { + targets = targetManagement.findByTargetFilterQueryAndNotInRolloutGroupsAndCompatible( pageRequest, readyGroups, targetFilter, rollout.getDistributionSet().getType()); + } else { + targets = targetManagement.findByFailedRolloutAndNotInRolloutGroups( + pageRequest, readyGroups, RolloutHelper.getIdFromRetriedTargetFilter(rollout.getTargetFilterQuery())); + } createAssignmentOfTargetsToGroup(targets, group); + return Long.valueOf(targets.getNumberOfElements()); }); } @@ -675,8 +690,8 @@ private void createScheduledAction(final Collection targets, final Distr action.setRolloutGroup(rolloutGroup); action.setInitiatedBy(rollout.getCreatedBy()); rollout.getWeight().ifPresent(action::setWeight); - rolloutManagement.setIsCleanedUpToFalseForTargetWithId(target.getId()); + actionRepository.save(action); }); } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutGroupManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutGroupManagement.java index 21da85bd7f..9bb9d83b3a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutGroupManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutGroupManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutHandler.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutHandler.java index b8e36fbaaa..f1857100d6 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutHandler.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2023 Bosch.IO GmbH and others. + * Copyright (c) 2023 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutManagement.java index 1ece3c4d7f..f81017c7c3 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaRolloutManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; @@ -209,10 +210,20 @@ public Rollout create(final RolloutCreate rollout, final List> getStatusCountItemForRollo return fromCache; } - @Override public void setRolloutStatusDetails(final Slice rollouts) { final List rolloutIds = rollouts.getContent().stream().map(Rollout::getId).collect(Collectors.toList()); @@ -666,10 +676,19 @@ public void cancelRolloutsForDistributionSet(final DistributionSet set) { private RolloutGroupsValidation validateTargetsInGroups(final List groups, final String baseFilter, final long totalTargets, final Long dsTypeId) { final List groupTargetCounts = new ArrayList<>(groups.size()); - final Map targetFilterCounts = groups.stream() + Map targetFilterCounts; + if (!RolloutHelper.isRolloutRetried(baseFilter)) { + targetFilterCounts = groups.stream() + .map(group -> RolloutHelper.getGroupTargetFilter(baseFilter, group)).distinct() + .collect(Collectors.toMap(Function.identity(), + groupTargetFilter -> targetManagement.countByRsqlAndCompatible(groupTargetFilter, dsTypeId))); + } else { + targetFilterCounts = groups.stream() .map(group -> RolloutHelper.getGroupTargetFilter(baseFilter, group)).distinct() .collect(Collectors.toMap(Function.identity(), - groupTargetFilter -> targetManagement.countByRsqlAndCompatible(groupTargetFilter, dsTypeId))); + groupTargetFilter -> targetManagement.countByFailedInRollout( + RolloutHelper.getIdFromRetriedTargetFilter(baseFilter), dsTypeId))); + } long unusedTargetsCount = 0; @@ -723,8 +742,11 @@ private long countOverlappingTargetsWithPreviousGroups(final String baseFilter, private long calculateRemainingTargets(final List groups, final String targetFilter, final Long createdAt, final Long dsTypeId) { - final String baseFilter = RolloutHelper.getTargetFilterQuery(targetFilter, createdAt); - final long totalTargets = targetManagement.countByRsqlAndCompatible(baseFilter, dsTypeId); + + final TargetCount targets = calculateTargets(targetFilter, createdAt, dsTypeId); + long totalTargets = targets.total(); + final String baseFilter = targets.filter(); + if (totalTargets == 0) { throw new ConstraintDeclarationException("Rollout target filter does not match any targets"); } @@ -739,9 +761,9 @@ private long calculateRemainingTargets(final List groups, final St public ListenableFuture validateTargetsInGroups(final List groups, final String targetFilter, final Long createdAt, final Long dsTypeId) { - final String baseFilter = RolloutHelper.getTargetFilterQuery(targetFilter, createdAt); - - final long totalTargets = targetManagement.countByRsqlAndCompatible(baseFilter, dsTypeId); + final TargetCount targets = calculateTargets(targetFilter, createdAt, dsTypeId); + long totalTargets = targets.total(); + final String baseFilter = targets.filter(); if (totalTargets == 0) { throw new ConstraintDeclarationException("Rollout target filter does not match any targets"); @@ -778,4 +800,21 @@ public void triggerNextGroup(final long rolloutId) { startNextRolloutGroupAction.exec(rollout, latestRunning); } + private TargetCount calculateTargets(final String targetFilter, final Long createdAt, final Long dsTypeId) { + String baseFilter; + long totalTargets; + if (!RolloutHelper.isRolloutRetried(targetFilter)) { + baseFilter = RolloutHelper.getTargetFilterQuery(targetFilter, createdAt); + totalTargets = targetManagement.countByRsqlAndCompatible(baseFilter, dsTypeId); + } else { + totalTargets = targetManagement.countByFailedInRollout( + RolloutHelper.getIdFromRetriedTargetFilter(targetFilter), dsTypeId); + baseFilter = targetFilter; + } + + return new TargetCount(totalTargets, baseFilter); + } + + private record TargetCount(long total, String filter) {} + } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSoftwareModuleManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSoftwareModuleManagement.java index 5f46047f37..2ee788bfb5 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSoftwareModuleManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSoftwareModuleManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSoftwareModuleTypeManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSoftwareModuleTypeManagement.java index e70ddd73e4..8f45a87d7c 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSoftwareModuleTypeManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSoftwareModuleTypeManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java index fc065306c6..40f84acdb0 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaSystemManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetFilterQueryManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetFilterQueryManagement.java index 6d711c19ef..a07a28439e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetFilterQueryManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetFilterQueryManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java index 14fa56b94e..4a783206b1 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; @@ -751,6 +752,17 @@ public Slice findByTargetFilterQueryAndNotInRolloutGroupsAndCompatible(f return JpaManagementHelper.findAllWithoutCountBySpec(targetRepository, pageRequest, specList); } + @Override + public Slice findByFailedRolloutAndNotInRolloutGroups(Pageable pageRequest, Collection groups, + String rolloutId) { + final List> specList = Arrays.asList( + TargetSpecifications.failedActionsForRollout(rolloutId), + TargetSpecifications.isNotInRolloutGroups(groups) + ); + + return JpaManagementHelper.findAllWithCountBySpec(targetRepository, pageRequest, specList); + } + @Override public Slice findByInRolloutGroupWithoutAction(final Pageable pageRequest, final long group) { if (!rolloutGroupRepository.existsById(group)) { @@ -773,6 +785,15 @@ public long countByRsqlAndNotInRolloutGroupsAndCompatible(final Collection return JpaManagementHelper.countBySpec(targetRepository, specList); } + @Override + public long countByFailedRolloutAndNotInRolloutGroups(Collection groups, String rolloutId) { + final List> specList = Arrays.asList( + TargetSpecifications.failedActionsForRollout(rolloutId), + TargetSpecifications.isNotInRolloutGroups(groups)); + + return JpaManagementHelper.countBySpec(targetRepository, specList); + } + @Override public long countByRsqlAndNonDSAndCompatible(final long distributionSetId, final String targetFilterQuery) { final DistributionSet jpaDistributionSet = distributionSetManagement.getOrElseThrowException(distributionSetId); @@ -854,6 +875,14 @@ public long countByRsqlAndCompatible(final String targetFilterQuery, final Long return JpaManagementHelper.countBySpec(targetRepository, specList); } + @Override + public long countByFailedInRollout(final String rolloutId, final Long dsTypeId) { + final List> specList = List.of( + TargetSpecifications.failedActionsForRollout(rolloutId)); + + return JpaManagementHelper.countBySpec(targetRepository, specList); + } + @Override public Optional get(final long id) { return targetRepository.findById(id).map(t -> t); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetTagManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetTagManagement.java index c77418c0bc..9a18b58c99 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetTagManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetTagManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetTypeManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetTypeManagement.java index f2fe37ecb6..5ef3026337 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetTypeManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTargetTypeManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTenantConfigurationManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTenantConfigurationManagement.java index ee443f1dee..9545fa8b4e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTenantConfigurationManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTenantConfigurationManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTenantStatsManagement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTenantStatsManagement.java index b5f4b1ec4f..dbb27fd8cb 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTenantStatsManagement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/JpaTenantStatsManagement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/LocalArtifactRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/LocalArtifactRepository.java index 86ea6766cf..5616a0061a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/LocalArtifactRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/LocalArtifactRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/NoCountBaseRepositoryTypeProvider.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/NoCountBaseRepositoryTypeProvider.java index c0ec39e5d2..1b208d8829 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/NoCountBaseRepositoryTypeProvider.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/NoCountBaseRepositoryTypeProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/NoCountSliceRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/NoCountSliceRepository.java index 737f40b219..3c9c17d9bc 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/NoCountSliceRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/NoCountSliceRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OfflineDsAssignmentStrategy.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OfflineDsAssignmentStrategy.java index e6005713cb..e31dcbb7d4 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OfflineDsAssignmentStrategy.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OfflineDsAssignmentStrategy.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OnlineDsAssignmentStrategy.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OnlineDsAssignmentStrategy.java index 59b3bc81b9..1a0034c810 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OnlineDsAssignmentStrategy.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/OnlineDsAssignmentStrategy.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RepositoryApplicationConfiguration.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RepositoryApplicationConfiguration.java index 0fd3367bea..95f491331f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RepositoryApplicationConfiguration.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RepositoryApplicationConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RolloutGroupRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RolloutGroupRepository.java index 595fcfb220..1677a15e54 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RolloutGroupRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RolloutGroupRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RolloutRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RolloutRepository.java index 9df1ef8b16..7ae33e7603 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RolloutRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RolloutRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RolloutTargetGroupRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RolloutTargetGroupRepository.java index 72a86e4ed5..6406397566 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RolloutTargetGroupRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RolloutTargetGroupRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SimpleJpaWithNoCountRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SimpleJpaWithNoCountRepository.java index 1c7e021680..585dd5834e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SimpleJpaWithNoCountRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SimpleJpaWithNoCountRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleMetadataRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleMetadataRepository.java index fa3cec4d31..7010b96081 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleMetadataRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleMetadataRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleRepository.java index 9c4a46e750..07a397d783 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleTypeRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleTypeRepository.java index 417a99803c..727d691c93 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleTypeRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleTypeRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SystemManagementCacheKeyGenerator.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SystemManagementCacheKeyGenerator.java index 545fedcaed..562f1880b6 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SystemManagementCacheKeyGenerator.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/SystemManagementCacheKeyGenerator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetFilterQueryRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetFilterQueryRepository.java index d5170e5355..53e242353d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetFilterQueryRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetFilterQueryRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetMetadataRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetMetadataRepository.java index 588092a2bf..dd53a662c4 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetMetadataRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetMetadataRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetRepository.java index 6344d72526..f003e2508d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetTagRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetTagRepository.java index 4570ddb0cd..0938e083a7 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetTagRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetTagRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetTypeRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetTypeRepository.java index c815efce3b..08bc55042a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetTypeRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TargetTypeRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TenantConfigurationRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TenantConfigurationRepository.java index b01ed21b32..99adffdf50 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TenantConfigurationRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TenantConfigurationRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TenantKeyGenerator.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TenantKeyGenerator.java index 0478d99d7d..813de05c0f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TenantKeyGenerator.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TenantKeyGenerator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TenantMetaDataRepository.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TenantMetaDataRepository.java index 8e8a9ee07c..60732778c4 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TenantMetaDataRepository.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/TenantMetaDataRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/aspects/ExceptionMappingAspectHandler.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/aspects/ExceptionMappingAspectHandler.java index 4837f4254f..9038062cb4 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/aspects/ExceptionMappingAspectHandler.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/aspects/ExceptionMappingAspectHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.aspects; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AbstractAutoAssignExecutor.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AbstractAutoAssignExecutor.java index a6a6a61ae0..b396599499 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AbstractAutoAssignExecutor.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AbstractAutoAssignExecutor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.autoassign; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignChecker.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignChecker.java index 9d80c125c1..0a8701c7e5 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignChecker.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignChecker.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.autoassign; @@ -94,8 +95,6 @@ private void checkByTargetFilterQueryAndAssignDS(final TargetFilterQuery targetF LOGGER.debug("Auto assign check call for tenant {} and target filter query id {} started", getTenantAware().getCurrentTenant(), targetFilterQuery.getId()); try { - final DistributionSet distributionSet = targetFilterQuery.getAutoAssignDistributionSet(); - int count; do { final List controllerIds = targetManagement @@ -109,7 +108,7 @@ private void checkByTargetFilterQueryAndAssignDS(final TargetFilterQuery targetF count = runTransactionalAssignment(targetFilterQuery, controllerIds); - LOGGER.debug("Running AutoAssignCheck. TFQ: " + targetFilterQuery.getQuery() + " with DS: " + distributionSet.getName()); + LOGGER.debug("Running AutoAssignCheck. TFQ: " + targetFilterQuery.getQuery() + " with DS: " + targetFilterQuery.getAutoAssignDistributionSet().getName()); LOGGER.debug( "Assignment for {} auto assign targets for tenant {} and target filter query id {} finished", controllerIds.size(), getTenantAware().getCurrentTenant(), targetFilterQuery.getId()); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignScheduler.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignScheduler.java index f06c43c770..1e2d654222 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignScheduler.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignScheduler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.autoassign; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanup.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanup.java index d4d278a1ba..4aac657075 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanup.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanup.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.autocleanup; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoCleanupScheduler.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoCleanupScheduler.java index 2607c8b24d..5b0d7f622e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoCleanupScheduler.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoCleanupScheduler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.autocleanup; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autocleanup/CleanupTask.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autocleanup/CleanupTask.java index 405c4152da..3c45d534e3 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autocleanup/CleanupTask.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/autocleanup/CleanupTask.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.autocleanup; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaActionStatusBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaActionStatusBuilder.java index acb12c15cf..5946eb8b81 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaActionStatusBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaActionStatusBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaActionStatusCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaActionStatusCreate.java index 2af0b64790..a4151e936d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaActionStatusCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaActionStatusCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetBuilder.java index 521d0ff0f3..bd06c8dc16 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetCreate.java index 7b005ced4a..708563d731 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetTypeBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetTypeBuilder.java index 01bac1916a..134b1bba27 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetTypeBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetTypeBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetTypeCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetTypeCreate.java index f645efa35d..110cc54562 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetTypeCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaDistributionSetTypeCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutBuilder.java index dbf908e4e0..11dbcb278d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutCreate.java index faa1b08555..cfc936adde 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutGroupBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutGroupBuilder.java index 96671113da..4afa5128a3 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutGroupBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutGroupBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutGroupCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutGroupCreate.java index 810e386cc1..21a33b3283 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutGroupCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaRolloutGroupCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleBuilder.java index 29063f6a79..b8be5b271c 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleCreate.java index 377e1cd366..d8818eb13f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleMetadataBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleMetadataBuilder.java index ddb9cd50d6..004f777e7a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleMetadataBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleMetadataBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleMetadataCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleMetadataCreate.java index 26917d994c..31536c5c56 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleMetadataCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleMetadataCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleTypeBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleTypeBuilder.java index afd7eec1b3..3df3eb843d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleTypeBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleTypeBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleTypeCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleTypeCreate.java index 54fcd3ab56..7045f338e4 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleTypeCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaSoftwareModuleTypeCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTagBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTagBuilder.java index 79f76f4a43..3367674493 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTagBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTagBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTagCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTagCreate.java index 69759a61e4..0739fb5aa2 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTagCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTagCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetBuilder.java index 48f7109e22..4245453e92 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetCreate.java index d1701431a6..4594e8e62f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryBuilder.java index 24f4e48678..fc41507556 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryCreate.java index 5cf6c185c3..fa35bb83bc 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetFilterQueryCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeBuilder.java index 2ab2802484..662ed84c73 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeCreate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeCreate.java index 67a0d7b552..860265f10a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeCreate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetTypeCreate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetUpdate.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetUpdate.java index 5a6a665a36..179ed8f628 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetUpdate.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/builder/JpaTargetUpdate.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.builder; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/configuration/Constants.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/configuration/Constants.java index 76aa080c5f..26f1e3b8a8 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/configuration/Constants.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/configuration/Constants.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.configuration; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/configuration/MultiTenantJpaTransactionManager.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/configuration/MultiTenantJpaTransactionManager.java index 5cca95917a..66feeec5da 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/configuration/MultiTenantJpaTransactionManager.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/configuration/MultiTenantJpaTransactionManager.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.configuration; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/event/JpaEventEntityManager.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/event/JpaEventEntityManager.java index c4028727df..9dee7b4784 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/event/JpaEventEntityManager.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/event/JpaEventEntityManager.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.event; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/executor/AfterTransactionCommitDefaultServiceExecutor.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/executor/AfterTransactionCommitDefaultServiceExecutor.java index c711b1747f..2aff2e972a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/executor/AfterTransactionCommitDefaultServiceExecutor.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/executor/AfterTransactionCommitDefaultServiceExecutor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.executor; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/executor/AfterTransactionCommitExecutor.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/executor/AfterTransactionCommitExecutor.java index 34b0e8d5fa..024b557033 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/executor/AfterTransactionCommitExecutor.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/executor/AfterTransactionCommitExecutor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.executor; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaBaseEntity.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaBaseEntity.java index c5acab524b..908b2c9de1 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaBaseEntity.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaBaseEntity.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaMetaData.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaMetaData.java index d94175a803..37dd1bafb6 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaMetaData.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaMetaData.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaNamedEntity.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaNamedEntity.java index 368278628c..48bd866c90 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaNamedEntity.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaNamedEntity.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaNamedVersionedEntity.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaNamedVersionedEntity.java index de527e9e0b..3ae9c11c2a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaNamedVersionedEntity.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaNamedVersionedEntity.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaTenantAwareBaseEntity.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaTenantAwareBaseEntity.java index c933b82167..1e94fce041 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaTenantAwareBaseEntity.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/AbstractJpaTenantAwareBaseEntity.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DistributionSetTypeElement.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DistributionSetTypeElement.java index 74ee54059b..f35d66336d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DistributionSetTypeElement.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DistributionSetTypeElement.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DistributionSetTypeElementCompositeKey.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DistributionSetTypeElementCompositeKey.java index eb3dbca00b..68a756c283 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DistributionSetTypeElementCompositeKey.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DistributionSetTypeElementCompositeKey.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DsMetadataCompositeKey.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DsMetadataCompositeKey.java index 001c8f4e54..fc36b073bc 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DsMetadataCompositeKey.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/DsMetadataCompositeKey.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListener.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListener.java index 68f2e8ae66..ee3be2edb1 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListener.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListener.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java index 7c586f5061..e08e197155 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EntityPropertyChangeListener.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EventAwareEntity.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EventAwareEntity.java index cd0f3f1889..9fe2b382d2 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EventAwareEntity.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/EventAwareEntity.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAction.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAction.java index 61c5261e65..f3aa592d6e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAction.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAction.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaActionStatus.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaActionStatus.java index f3f32dda32..a9bee65a1f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaActionStatus.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaActionStatus.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaArtifact.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaArtifact.java index 0b4d005783..1383d91804 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaArtifact.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaArtifact.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAutoConfirmationStatus.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAutoConfirmationStatus.java index c88ca3ad9b..5faf84e08c 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAutoConfirmationStatus.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaAutoConfirmationStatus.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java index e9c122c205..3114eaf3c1 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSet.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetMetadata.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetMetadata.java index 6755577127..fb124c1744 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetMetadata.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetMetadata.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetTag.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetTag.java index 45e0af13e2..bf2382bc79 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetTag.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetTag.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetType.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetType.java index d747b36105..1492b7a1e7 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetType.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaDistributionSetType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java index 6dd2241464..8c0f7adc9c 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRollout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java index 409e91e37f..68338f60e2 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaRolloutGroup.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java index 41833e396b..8b21e9798e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModule.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModuleMetadata.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModuleMetadata.java index 4456f031f2..6a04322437 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModuleMetadata.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModuleMetadata.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModuleType.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModuleType.java index c39d45a537..1816bfe63f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModuleType.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaSoftwareModuleType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaStatistic.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaStatistic.java index 137e5414d7..25b68c6e28 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaStatistic.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaStatistic.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2023 Bosch.IO GmbH and others. + * Copyright (c) 2023 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTag.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTag.java index c888217a3b..423e76d60f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTag.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTag.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java index 6a0a45f7b2..55292345d9 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTarget.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetFilterQuery.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetFilterQuery.java index a464f77f39..e30ec75618 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetFilterQuery.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetFilterQuery.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetMetadata.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetMetadata.java index 6deaf9f52a..90977c5779 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetMetadata.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetMetadata.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetTag.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetTag.java index 1eaf403e08..c69a57cb63 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetTag.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetTag.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetType.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetType.java index cd6054cc31..495c27d6a5 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetType.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTargetType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantConfiguration.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantConfiguration.java index b134d18840..ede2ce9d9e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantConfiguration.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantMetaData.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantMetaData.java index d964a8c423..9ad553359f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantMetaData.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantMetaData.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/RolloutTargetGroup.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/RolloutTargetGroup.java index 86992d4488..d50e4c8489 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/RolloutTargetGroup.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/RolloutTargetGroup.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/RolloutTargetGroupId.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/RolloutTargetGroupId.java index b4001d9dc1..c7dc0ff857 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/RolloutTargetGroupId.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/RolloutTargetGroupId.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/SwMetadataCompositeKey.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/SwMetadataCompositeKey.java index fa2196835c..fd0aae8862 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/SwMetadataCompositeKey.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/SwMetadataCompositeKey.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/TargetMetadataCompositeKey.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/TargetMetadataCompositeKey.java index d65f941bff..6217bc98df 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/TargetMetadataCompositeKey.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/TargetMetadataCompositeKey.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/AfterTransactionCommitExecutorHolder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/AfterTransactionCommitExecutorHolder.java index a0e918585d..7c922b91ab 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/AfterTransactionCommitExecutorHolder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/AfterTransactionCommitExecutorHolder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model.helper; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/EntityInterceptorHolder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/EntityInterceptorHolder.java index 4d912d31a0..3a990d1f73 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/EntityInterceptorHolder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/EntityInterceptorHolder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model.helper; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/SecurityChecker.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/SecurityChecker.java index da4f223e61..3b173c4dd4 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/SecurityChecker.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/SecurityChecker.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model.helper; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/SecurityTokenGeneratorHolder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/SecurityTokenGeneratorHolder.java index 64c158c878..441487e31a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/SecurityTokenGeneratorHolder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/SecurityTokenGeneratorHolder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model.helper; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/TenantAwareHolder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/TenantAwareHolder.java index a034cd605a..1cb664fcce 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/TenantAwareHolder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/helper/TenantAwareHolder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model.helper; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/RolloutScheduler.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/RolloutScheduler.java index f72ffccf29..4d64e8de42 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/RolloutScheduler.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/RolloutScheduler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rollout; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/EvaluatorNotConfiguredException.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/EvaluatorNotConfiguredException.java index fdbf4af0dd..97c46ba388 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/EvaluatorNotConfiguredException.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/EvaluatorNotConfiguredException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2023 Bosch.IO GmbH and others. + * Copyright (c) 2023 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rollout.condition; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/PauseRolloutGroupAction.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/PauseRolloutGroupAction.java index 1250f15aaf..2b633f98ee 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/PauseRolloutGroupAction.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/PauseRolloutGroupAction.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rollout.condition; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/RolloutGroupActionEvaluator.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/RolloutGroupActionEvaluator.java index 0df60add0a..3286e2dc28 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/RolloutGroupActionEvaluator.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/RolloutGroupActionEvaluator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rollout.condition; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/RolloutGroupConditionEvaluator.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/RolloutGroupConditionEvaluator.java index b9b10fbb35..d0fdcc9a4f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/RolloutGroupConditionEvaluator.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/RolloutGroupConditionEvaluator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rollout.condition; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/RolloutGroupEvaluationManager.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/RolloutGroupEvaluationManager.java index 4c7cfe5fde..a8c2510d6b 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/RolloutGroupEvaluationManager.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/RolloutGroupEvaluationManager.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2023 Bosch.IO GmbH and others. + * Copyright (c) 2023 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rollout.condition; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/StartNextGroupRolloutGroupSuccessAction.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/StartNextGroupRolloutGroupSuccessAction.java index a4d4f8cd07..1723a3b11d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/StartNextGroupRolloutGroupSuccessAction.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/StartNextGroupRolloutGroupSuccessAction.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rollout.condition; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/ThresholdRolloutGroupErrorCondition.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/ThresholdRolloutGroupErrorCondition.java index 730eaccf41..62b3d35e10 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/ThresholdRolloutGroupErrorCondition.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/ThresholdRolloutGroupErrorCondition.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rollout.condition; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/ThresholdRolloutGroupSuccessCondition.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/ThresholdRolloutGroupSuccessCondition.java index 149ef689a1..0b3efa7095 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/ThresholdRolloutGroupSuccessCondition.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rollout/condition/ThresholdRolloutGroupSuccessCondition.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rollout.condition; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/AbstractFieldNameRSQLVisitor.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/AbstractFieldNameRSQLVisitor.java index c22629f99c..4724403d51 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/AbstractFieldNameRSQLVisitor.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/AbstractFieldNameRSQLVisitor.java @@ -1,21 +1,21 @@ /** - * Copyright (c) 2020 devolo GmbH and others. + * Copyright (c) 2020 devolo GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; -import cz.jirutka.rsql.parser.ast.ComparisonNode; - import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import javax.validation.constraints.NotNull; +import cz.jirutka.rsql.parser.ast.ComparisonNode; import org.eclipse.hawkbit.repository.FieldNameProvider; import org.eclipse.hawkbit.repository.exception.RSQLParameterUnsupportedFieldException; import org.slf4j.Logger; @@ -46,6 +46,7 @@ protected A getFieldEnumByName(final ComparisonNode node) { } protected String getAndValidatePropertyFieldName(final A propertyEnum, final ComparisonNode node) { + final String[] graph = propertyEnum.getSubAttributes(node.getSelector()); validateMapParameter(propertyEnum, node, graph); diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/DefaultRsqlVisitorFactory.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/DefaultRsqlVisitorFactory.java index 7f49abd1a3..2b5fe47a29 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/DefaultRsqlVisitorFactory.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/DefaultRsqlVisitorFactory.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/FieldValidationRsqlVisitor.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/FieldValidationRsqlVisitor.java index 0214437493..d5fe39eb67 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/FieldValidationRsqlVisitor.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/FieldValidationRsqlVisitor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitor.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitor.java index 7c46dd70dc..3c3ebfb76b 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitor.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/JpaQueryRsqlVisitor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/ParseExceptionWrapper.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/ParseExceptionWrapper.java index 5a4718d487..6c84e8a578 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/ParseExceptionWrapper.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/ParseExceptionWrapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/PropertyMapper.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/PropertyMapper.java index a7787dd541..49aa6dda33 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/PropertyMapper.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/PropertyMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtility.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtility.java index f0aea5b95c..172a85fb44 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtility.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtility.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; @@ -31,7 +32,10 @@ import cz.jirutka.rsql.parser.RSQLParser; import cz.jirutka.rsql.parser.RSQLParserException; -import cz.jirutka.rsql.parser.ast.*; +import cz.jirutka.rsql.parser.ast.ComparisonOperator; +import cz.jirutka.rsql.parser.ast.Node; +import cz.jirutka.rsql.parser.ast.RSQLOperators; +import cz.jirutka.rsql.parser.ast.RSQLVisitor; /** * A utility class which is able to parse RSQL strings into an spring data @@ -144,44 +148,6 @@ private static Node parseRsql(final String rsql) { } } - private static final class ValidationRSQLVisitor & FieldNameProvider> - extends AbstractFieldNameRSQLVisitor implements RSQLVisitor { - - - public ValidationRSQLVisitor(final Class fieldNameProvider) { - super(fieldNameProvider); - } - - @Override - public Boolean visit(AndNode node, String param) { - return visitNode(node, param); - } - - @Override - public Boolean visit(OrNode node, String param) { - return visitNode(node, param); - } - - @Override - public Boolean visit(ComparisonNode node, String param) { - try { - final A fieldName = (A) getFieldEnumByName(node); - getAndValidatePropertyFieldName(fieldName, node); - } catch (final RSQLParameterUnsupportedFieldException | IllegalArgumentException e) { - return false; - } - return true; - } - - private Boolean visitNode(LogicalNode node, String param) { - for (Node child : node.getChildren()) { - if (!child.accept(this, param)) - return false; - } - return true; - } - } - private static final class RSQLSpecification & FieldNameProvider, T> implements Specification { private static final long serialVersionUID = 1L; @@ -215,4 +181,5 @@ public Predicate toPredicate(final Root root, final CriteriaQuery query, f } } + } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracle.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracle.java index 803c7dfa4b..2b35a70a92 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracle.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/rsql/RsqlParserValidationOracle.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; @@ -32,7 +33,6 @@ import org.eclipse.persistence.exceptions.ConversionException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.springframework.orm.jpa.JpaSystemException; import org.springframework.util.CollectionUtils; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/ActionSpecifications.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/ActionSpecifications.java index fc48eae39b..91d38e47b5 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/ActionSpecifications.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/ActionSpecifications.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.specifications; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetSpecification.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetSpecification.java index 65795ed18a..aafb34c37e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetSpecification.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetSpecification.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.specifications; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetTypeSpecification.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetTypeSpecification.java index 420a785c72..05b489a689 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetTypeSpecification.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/DistributionSetTypeSpecification.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.specifications; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/SoftwareModuleSpecification.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/SoftwareModuleSpecification.java index 10ffdd9127..c8d73e0616 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/SoftwareModuleSpecification.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/SoftwareModuleSpecification.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.specifications; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/SoftwareModuleTypeSpecification.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/SoftwareModuleTypeSpecification.java index c5c5354c01..6d66cd4d0e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/SoftwareModuleTypeSpecification.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/SoftwareModuleTypeSpecification.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.specifications; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/SpecificationsBuilder.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/SpecificationsBuilder.java index 8600b2c524..ee9780d34c 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/SpecificationsBuilder.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/SpecificationsBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.specifications; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TagSpecification.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TagSpecification.java index e302600139..c8e00ac687 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TagSpecification.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TagSpecification.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.specifications; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TargetFilterQuerySpecification.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TargetFilterQuerySpecification.java index f03ab83fee..10962105af 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TargetFilterQuerySpecification.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TargetFilterQuerySpecification.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.specifications; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TargetSpecifications.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TargetSpecifications.java index 699e440e7d..c14261e405 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TargetSpecifications.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TargetSpecifications.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.specifications; @@ -41,8 +42,10 @@ import org.eclipse.hawkbit.repository.jpa.model.JpaTarget_; import org.eclipse.hawkbit.repository.jpa.model.RolloutTargetGroup; import org.eclipse.hawkbit.repository.jpa.model.RolloutTargetGroup_; +import org.eclipse.hawkbit.repository.model.Action; import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.repository.model.DistributionSetType; +import org.eclipse.hawkbit.repository.model.Rollout; import org.eclipse.hawkbit.repository.model.RolloutGroup; import org.eclipse.hawkbit.repository.model.Target; import org.eclipse.hawkbit.repository.model.TargetTag; @@ -249,34 +252,34 @@ public static Specification likeAttributeValue(final String searchTex /** * {@link Specification} for retrieving {@link Target}s by "like - * controllerId or like name". + * controllerId or like name or like description". * * @param searchText * to be filtered on * @return the {@link Target} {@link Specification} */ - public static Specification likeControllerIdOrName(final String searchText) { + public static Specification likeIdOrNameOrDescription(final String searchText) { return (targetRoot, query, cb) -> { final String searchTextToLower = searchText.toLowerCase(); return cb.or(cb.like(cb.lower(targetRoot.get(JpaTarget_.controllerId)), searchTextToLower), - cb.like(cb.lower(targetRoot.get(JpaTarget_.name)), searchTextToLower)); + cb.like(cb.lower(targetRoot.get(JpaTarget_.name)), searchTextToLower), + cb.like(cb.lower(targetRoot.get(JpaTarget_.description)), searchTextToLower)); }; } /** * {@link Specification} for retrieving {@link Target}s by "like - * controllerId or like name or like description". + * controllerId or like name". * * @param searchText * to be filtered on * @return the {@link Target} {@link Specification} */ - public static Specification likeIdOrNameOrDescription(final String searchText) { + public static Specification likeControllerIdOrName(final String searchText) { return (targetRoot, query, cb) -> { final String searchTextToLower = searchText.toLowerCase(); return cb.or(cb.like(cb.lower(targetRoot.get(JpaTarget_.controllerId)), searchTextToLower), - cb.like(cb.lower(targetRoot.get(JpaTarget_.name)), searchTextToLower), - cb.like(cb.lower(targetRoot.get(JpaTarget_.description)), searchTextToLower)); + cb.like(cb.lower(targetRoot.get(JpaTarget_.name)), searchTextToLower)); }; } @@ -667,4 +670,15 @@ public static Specification orderedByLinkedDistributionSet(final long }; } + public static Specification failedActionsForRollout(final String rolloutId) { + return (targetRoot, query, cb) -> { + Join targetActions = + targetRoot.join("actions"); + + return cb.and( + cb.equal(targetActions.get("rollout").get("id"), rolloutId), + cb.equal(targetActions.get("status"), Action.Status.ERROR)); + }; + } + } diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TargetTypeSpecification.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TargetTypeSpecification.java index edeefd6540..ade97e6bb8 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TargetTypeSpecification.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/specifications/TargetTypeSpecification.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.specifications; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/DeploymentHelper.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/DeploymentHelper.java index 5914b024db..1e9d99458e 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/DeploymentHelper.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/DeploymentHelper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.utils; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/FileSizeAndStorageQuotaCheckingInputStream.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/FileSizeAndStorageQuotaCheckingInputStream.java index 334a68f15c..4c520c758a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/FileSizeAndStorageQuotaCheckingInputStream.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/FileSizeAndStorageQuotaCheckingInputStream.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.utils; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaHelper.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaHelper.java index 595211332f..3ac2a28897 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaHelper.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/QuotaHelper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.utils; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/WeightValidationHelper.java b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/WeightValidationHelper.java index 39a8473e06..73aef894e2 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/WeightValidationHelper.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/utils/WeightValidationHelper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.utils; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/hawkbit-jpa-defaults.properties b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/hawkbit-jpa-defaults.properties index 6935451e53..a5d3e5f260 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/hawkbit-jpa-defaults.properties +++ b/hawkbit-repository/hawkbit-repository-jpa/src/main/resources/hawkbit-jpa-defaults.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. +# Copyright (c) 2015 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # spring.main.allow-bean-definition-overriding=true diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/AbstractRemoteEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/AbstractRemoteEventTest.java index 5a44f3c711..2e09ec26b3 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/AbstractRemoteEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/AbstractRemoteEventTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEventTest.java index a029f1d669..6ff00c8733 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteIdEventTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteTenantAwareEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteTenantAwareEventTest.java index 976ca058df..ad88c0f428 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteTenantAwareEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/RemoteTenantAwareEventTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRemoteEntityEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRemoteEntityEventTest.java index 9ba681d832..5a4ed4c9ab 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRemoteEntityEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/AbstractRemoteEntityEventTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionEventTest.java index 9173fbdb62..fd871ca6c2 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/ActionEventTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetCreatedEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetCreatedEventTest.java index 24ada1ac99..73b0567cd9 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetCreatedEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetCreatedEventTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagEventTest.java index 0788287e4d..1db1ee759b 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetTagEventTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetUpdatedEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetUpdatedEventTest.java index 41470db230..b79e682bc6 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetUpdatedEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/DistributionSetUpdatedEventTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutEventTest.java index b02138a235..001142a61c 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutEventTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupEventTest.java index 9e473e87fb..b5d33f9310 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/RolloutGroupEventTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleEventTest.java index 3636c1b940..f1f00dad14 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/SoftwareModuleEventTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetEventTest.java index 45f1d31892..79d6434d28 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetEventTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagEventTest.java index 76127f6267..496e39bcb3 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/event/remote/entity/TargetTagEventTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.event.remote.entity; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/AbstractJpaIntegrationTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/AbstractJpaIntegrationTest.java index 8673035e5d..4d83c70f16 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/AbstractJpaIntegrationTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/AbstractJpaIntegrationTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ActionTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ActionTest.java index bdc616eb4f..5847f35972 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ActionTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ActionTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ArtifactManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ArtifactManagementTest.java index c8b945f62f..033f4766c6 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ArtifactManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ArtifactManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * Copyright (c) 2015 Bosch Software Innovations GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ConcurrentDistributionSetInvalidationTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ConcurrentDistributionSetInvalidationTest.java index 98c1f0703c..9496f98208 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ConcurrentDistributionSetInvalidationTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ConcurrentDistributionSetInvalidationTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ConfirmationManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ConfirmationManagementTest.java index ec666d12f2..6cc57d2a2a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ConfirmationManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ConfirmationManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ControllerManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ControllerManagementTest.java index 2ea5edc8d3..5cf209e8f1 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ControllerManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/ControllerManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java index f05bcaae35..8c0bec204a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DeploymentManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetInvalidationManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetInvalidationManagementTest.java index 35f490ee12..14cf676edb 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetInvalidationManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetInvalidationManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java index cc80508b99..c8d972a7c4 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTagManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTagManagementTest.java index 7ea3d4190e..2bde125385 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTagManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTagManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTypeManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTypeManagementTest.java index 7654fcf239..2b20625207 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTypeManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/DistributionSetTypeManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/HawkBitEclipseLinkJpaDialectTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/HawkBitEclipseLinkJpaDialectTest.java index 9544ae802f..6aff2d05d1 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/HawkBitEclipseLinkJpaDialectTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/HawkBitEclipseLinkJpaDialectTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/LazyControllerManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/LazyControllerManagementTest.java index 029822700d..9cae02e71f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/LazyControllerManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/LazyControllerManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RandomGeneratedInputStream.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RandomGeneratedInputStream.java index 1ddcdc0565..b62ca5b5d7 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RandomGeneratedInputStream.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RandomGeneratedInputStream.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutGroupManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutGroupManagementTest.java index 0307bf40ca..396d826e6c 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutGroupManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutGroupManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutManagementTest.java index 2621245a13..aea86ea67f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/RolloutManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleManagementTest.java index 6efd7fa855..84f97aaadb 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleTypeManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleTypeManagementTest.java index c0dbc6e2da..de78689506 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleTypeManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SoftwareModuleTypeManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SystemManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SystemManagementTest.java index 5e46aa27d3..e02755c080 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SystemManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/SystemManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetFilterQueryManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetFilterQueryManagementTest.java index bb2921137c..a577a466f5 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetFilterQueryManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetFilterQueryManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementSearchTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementSearchTest.java index 3d8d06e890..a05f490a1a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementSearchTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementSearchTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementTest.java index 9797678d58..84d9da1d73 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetTagManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetTagManagementTest.java index 45d0897191..0517a952c0 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetTagManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetTagManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetTypeManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetTypeManagementTest.java index a1ab551980..b6bd697051 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetTypeManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TargetTypeManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TenantConfigurationManagementTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TenantConfigurationManagementTest.java index be3b67b249..9891e519b9 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TenantConfigurationManagementTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/TenantConfigurationManagementTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignCheckerIntTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignCheckerIntTest.java index 27e017668c..bc963b31a1 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignCheckerIntTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignCheckerIntTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.autoassign; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignCheckerTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignCheckerTest.java index 8bce839589..6ea492377a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignCheckerTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autoassign/AutoAssignCheckerTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.autoassign; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanupTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanupTest.java index ed41a748bb..17bd0a10fc 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanupTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoActionCleanupTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.autocleanup; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoCleanupSchedulerTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoCleanupSchedulerTest.java index 35c8ea441e..8575e7de49 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoCleanupSchedulerTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/autocleanup/AutoCleanupSchedulerTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.autocleanup; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/event/RepositoryEntityEventTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/event/RepositoryEntityEventTest.java index ef70bf86ad..71174ca14f 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/event/RepositoryEntityEventTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/event/RepositoryEntityEventTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.event; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java index 040628c830..79402309df 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/ModelEqualsHashcodeTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/ModelEqualsHashcodeTest.java index e5a367f40d..791e848851 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/ModelEqualsHashcodeTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/ModelEqualsHashcodeTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.model; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLActionFieldsTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLActionFieldsTest.java index 63819a4559..9e231e5251 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLActionFieldsTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLActionFieldsTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetFieldTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetFieldTest.java index b69b6b0331..f1a3d4b124 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetFieldTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetFieldTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetMetadataFieldsTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetMetadataFieldsTest.java index ffa35e0783..140f87db2a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetMetadataFieldsTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLDistributionSetMetadataFieldsTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLParserValidationOracleTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLParserValidationOracleTest.java index fa7554e5d4..a6b0eaa5a0 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLParserValidationOracleTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLParserValidationOracleTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFieldTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFieldTest.java index bfa88d98e6..c6445ee4dd 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFieldTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLRolloutGroupFieldTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleFieldTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleFieldTest.java index 695350fbcd..d9905a15d8 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleFieldTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleFieldTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleMetadataFieldsTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleMetadataFieldsTest.java index 98aee2f039..6ca06a4e18 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleMetadataFieldsTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleMetadataFieldsTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleTypeFieldsTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleTypeFieldsTest.java index 63d3c197fb..c8c111ca29 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleTypeFieldsTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLSoftwareModuleTypeFieldsTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTagFieldsTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTagFieldsTest.java index 720de1d7b7..f760d94be4 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTagFieldsTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTagFieldsTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetFieldTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetFieldTest.java index 48e020c6f2..3420a5bb9d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetFieldTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetFieldTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetFilterQueryFieldsTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetFilterQueryFieldsTest.java index 26ddbc8d42..f400ca3f0d 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetFilterQueryFieldsTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetFilterQueryFieldsTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetMetadataFieldsTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetMetadataFieldsTest.java index 9c6e181b4f..141ae5fd9b 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetMetadataFieldsTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLTargetMetadataFieldsTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtilityTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtilityTest.java index 461996c157..9e19d71661 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtilityTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/RSQLUtilityTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/VirtualPropertyResolverTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/VirtualPropertyResolverTest.java index ce7fc25db6..c121b5add1 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/VirtualPropertyResolverTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/rsql/VirtualPropertyResolverTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.rsql; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/specifications/SpecificationsBuilderTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/specifications/SpecificationsBuilderTest.java index 662bf12622..127120dd8a 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/specifications/SpecificationsBuilderTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/specifications/SpecificationsBuilderTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.specifications; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/tenancy/MultiTenancyEntityTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/tenancy/MultiTenancyEntityTest.java index fe247c2512..7ad4e4e143 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/tenancy/MultiTenancyEntityTest.java +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/tenancy/MultiTenancyEntityTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.repository.jpa.tenancy; diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/resources/jpa-test.properties b/hawkbit-repository/hawkbit-repository-jpa/src/test/resources/jpa-test.properties index f329faeec5..52893a920c 100644 --- a/hawkbit-repository/hawkbit-repository-jpa/src/test/resources/jpa-test.properties +++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/resources/jpa-test.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. +# Copyright (c) 2015 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Debug utility functions - START diff --git a/hawkbit-repository/hawkbit-repository-test/pom.xml b/hawkbit-repository/hawkbit-repository-test/pom.xml index 9f14b6c6c0..62b47718b6 100644 --- a/hawkbit-repository/hawkbit-repository-test/pom.xml +++ b/hawkbit-repository/hawkbit-repository-test/pom.xml @@ -1,11 +1,12 @@ @@ -37,6 +38,22 @@ javax.validation validation-api + + org.eclipse.hawkbit + hawkbit-rest-core + ${project.version} + + + + org.springdoc + springdoc-openapi-ui + ${springdoc-openapi.version} + + + org.springdoc + springdoc-openapi-security + ${springdoc-openapi.version} + diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActionFeedback.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActionFeedback.java index aa02bc23c7..05c7a9c39e 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActionFeedback.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActionFeedback.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; @@ -14,6 +15,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** *

@@ -38,6 +40,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class DdiActionFeedback { + @Schema(example = "2023-08-03T12:31:41.890992967Z") private final String time; @NotNull diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActionHistory.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActionHistory.java index 3d802ff0f2..b719561e07 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActionHistory.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActionHistory.java @@ -1,15 +1,17 @@ /** - * Copyright (c) Siemens AG, 2017 + * Copyright (c) 2017 Siemens AG * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; import java.util.List; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.ddi.rest.api.DdiRootControllerRestApi; import com.fasterxml.jackson.annotation.JsonCreator; @@ -31,6 +33,7 @@ public class DdiActionHistory { @JsonProperty("status") + @Schema(example = "RUNNING") private final String actionStatus; @JsonProperty("messages") diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActivateAutoConfirmation.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActivateAutoConfirmation.java index f9987d4be2..bafa46c216 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActivateAutoConfirmation.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiActivateAutoConfirmation.java @@ -1,24 +1,28 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; @JsonIgnoreProperties(ignoreUnknown = true) public class DdiActivateAutoConfirmation { @JsonProperty(required = false) + @Schema(example = "exampleUser") private final String initiator; @JsonProperty(required = false) + @Schema(example = "exampleRemark") private final String remark; /** diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifact.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifact.java index 06e75eb3fd..7f88058823 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifact.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifact.java @@ -1,15 +1,17 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; import javax.validation.constraints.NotNull; +import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.hateoas.RepresentationModel; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -24,12 +26,14 @@ public class DdiArtifact extends RepresentationModel { @NotNull @JsonProperty + @Schema(example = "binary.tgz") private String filename; @JsonProperty private DdiArtifactHash hashes; @JsonProperty + @Schema(example = "3") private Long size; public DdiArtifactHash getHashes() { diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactHash.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactHash.java index 02384f5a84..0ee1d3d9ef 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactHash.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactHash.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; @@ -12,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Hashes for given Artifact. @@ -20,13 +22,16 @@ public class DdiArtifactHash { @JsonProperty + @Schema(example = "2d86c2a659e364e9abba49ea6ffcd53dd5559f05") private String sha1; @JsonProperty + @Schema(example = "0d1b08c34858921bc7c662b228acb7ba") private String md5; @JsonProperty @JsonInclude(Include.NON_NULL) + @Schema(example = "a03b221c6c6eae7122ca51695d456d5222e524889136394944b2f9763b483615") private String sha256; /** diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiAutoConfirmationState.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiAutoConfirmationState.java index bcd4903449..6903b367f5 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiAutoConfirmationState.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiAutoConfirmationState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; @@ -13,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.hateoas.RepresentationModel; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -21,10 +23,14 @@ public class DdiAutoConfirmationState extends RepresentationModel { @NotNull + @Schema(example = "true") private boolean active; + @Schema(example = "exampleUserId") private String initiator; + @Schema(example = "exampleRemark") private String remark; + @Schema(example = "1691065895439") private Long activatedAt; /** diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiCancel.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiCancel.java index 1f28cfacb3..faee27afd7 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiCancel.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiCancel.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; @@ -13,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Cancel action to be provided to the target. @@ -20,6 +22,7 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class DdiCancel { + @Schema(example = "11") private final String id; @NotNull diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelActionToStop.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelActionToStop.java index 9b572962b3..f192d572bb 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelActionToStop.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelActionToStop.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; @@ -13,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * The action that has to be stopped by the target. @@ -21,6 +23,7 @@ public class DdiCancelActionToStop { @NotNull + @Schema(example = "11") private final String stopId; /** diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiChunk.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiChunk.java index 760104ac96..d4a7018f75 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiChunk.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiChunk.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; @@ -16,6 +17,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Deployment chunks. @@ -25,14 +27,17 @@ public class DdiChunk { @JsonProperty("part") @NotNull + @Schema(example = "bApp") private String part; @JsonProperty("version") @NotNull + @Schema(example = "1.2.0") private String version; @JsonProperty("name") @NotNull + @Schema(example = "oneApp") private String name; @JsonProperty("encrypted") diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfig.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfig.java index d01b9f277f..71731aacfb 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfig.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfig.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigData.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigData.java index 030d81a61e..4eabfca0de 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigData.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigData.java @@ -1,13 +1,15 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ -package org.eclipse.hawkbit.ddi.json.model; + package org.eclipse.hawkbit.ddi.json.model; +import java.util.HashMap; import java.util.Map; import javax.validation.constraints.NotEmpty; @@ -15,6 +17,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Feedback channel for ConfigData action. @@ -25,6 +28,7 @@ public class DdiConfigData { @NotEmpty private final Map data; + @Schema(example = "merge") private final DdiUpdateMode mode; /** diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBase.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBase.java index b57aed7982..945842ffab 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBase.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBase.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBaseAction.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBaseAction.java index c64504e70a..feb20af733 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBaseAction.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBaseAction.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; @@ -12,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.hateoas.RepresentationModel; import javax.validation.constraints.NotNull; @@ -26,6 +28,7 @@ public class DdiConfirmationBaseAction extends RepresentationModel details; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiControllerBase.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiControllerBase.java index b1c86547bf..4dfcdc8851 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiControllerBase.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiControllerBase.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiDeployment.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiDeployment.java index 996bb06b21..a50ea1c54c 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiDeployment.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiDeployment.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentBase.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentBase.java index 67f20af25b..37693b5db6 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentBase.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentBase.java @@ -1,15 +1,17 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; import javax.validation.constraints.NotNull; +import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.hateoas.RepresentationModel; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -26,6 +28,7 @@ public class DdiDeploymentBase extends RepresentationModel { @JsonProperty("id") @NotNull + @Schema(example = "8") private String id; @JsonProperty("deployment") diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiMetadata.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiMetadata.java index 48b4e0c38c..9a70dda804 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiMetadata.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiMetadata.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; @@ -13,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Additional metadata to be provided for the target/device. @@ -22,10 +24,12 @@ public class DdiMetadata { @JsonProperty @NotNull + @Schema(example = "aMetadataKey") private final String key; @JsonProperty @NotNull + @Schema(example = "Metadata value as defined in software module") private final String value; @JsonCreator diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiPolling.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiPolling.java index 81427510a6..3be0353039 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiPolling.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiPolling.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; @@ -12,6 +13,10 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyDescription; +import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.v3.oas.annotations.media.ExampleObject; +import io.swagger.v3.oas.annotations.media.Schema; /** * Polling interval for the SP target. @@ -21,6 +26,7 @@ public class DdiPolling { @JsonProperty + @Schema(example = "12:00:00") private String sleep; /** diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiProgress.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiProgress.java index fd2a240853..f9fc0d62b9 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiProgress.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiProgress.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; @@ -13,6 +14,7 @@ import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Action fulfillment progress by means of gives the achieved amount of maximal @@ -22,8 +24,10 @@ public class DdiProgress { @NotNull + @Schema(example = "2") private final Integer cnt; + @Schema(example = "5") private final Integer of; /** diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiResult.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiResult.java index 47ced8968c..4f5df1cf42 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiResult.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiResult.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; @@ -15,6 +16,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.v3.oas.annotations.media.Schema; /** * Result information of the action progress which can by an intermediate or diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiStatus.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiStatus.java index 96b615db2c..aab3f41ce4 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiStatus.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiStatus.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; @@ -18,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; +import io.swagger.v3.oas.annotations.media.Schema; /** * Details status information concerning the action processing. @@ -33,6 +35,7 @@ public class DdiStatus { @Valid private final DdiResult result; + @Schema(example = "200") private final Integer code; private final List details; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiUpdateMode.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiUpdateMode.java index 0c2c0efc89..f9bc055f5a 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiUpdateMode.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/json/model/DdiUpdateMode.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRestConstants.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRestConstants.java index e3a2cb6515..66ac4b2ae0 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRestConstants.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRestConstants.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.rest.api; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRootControllerRestApi.java b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRootControllerRestApi.java index ab41fa1dfa..7e8f684495 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRootControllerRestApi.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/main/java/org/eclipse/hawkbit/ddi/rest/api/DdiRootControllerRestApi.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.rest.api; @@ -15,6 +16,12 @@ import javax.validation.Valid; import javax.validation.constraints.NotEmpty; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import org.eclipse.hawkbit.ddi.json.model.DdiActionFeedback; import org.eclipse.hawkbit.ddi.json.model.DdiActivateAutoConfirmation; import org.eclipse.hawkbit.ddi.json.model.DdiArtifact; @@ -26,6 +33,7 @@ import org.eclipse.hawkbit.ddi.json.model.DdiConfirmationFeedback; import org.eclipse.hawkbit.ddi.json.model.DdiControllerBase; import org.eclipse.hawkbit.ddi.json.model.DdiDeploymentBase; +import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; import org.springframework.hateoas.MediaTypes; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -41,6 +49,7 @@ * REST resource handling for root controller CRUD operations. */ // no request mapping specified here to avoid CVE-2021-22044 in Feign client +@Tag(name = "DDI Root Controller", description = "REST resource handling for root controller CRUD operations") public interface DdiRootControllerRestApi { /** @@ -54,6 +63,16 @@ public interface DdiRootControllerRestApi { * of the software module * @return the response */ + @Operation(summary = "Return all artifacts of a given software module and target", description = "Returns all artifacts that are assigned to the software module") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/softwaremodules/{softwareModuleId}/artifacts", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) @@ -71,6 +90,20 @@ ResponseEntity> getSoftwareModulesArtifacts(@PathVariable("ten * * @return the response */ + @Operation(summary = "Root resource for an individual Target", description = """ + This base resource can be regularly polled by the controller on the provisioning target or device in order to retrieve actions that need to be executed. Those are provided as a list of links to give more detailed information about the action. Links are only available for initial configuration, open actions, or the latest installed action, respectively. The resource supports Etag based modification checks in order to save traffic. + + Note: deployments have to be confirmed in order to move on to the next action. Cancellations have to be confirmed or rejected. + """) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "In this case the (optional) query for the last 10 messages, previously provided by the device, are included. Useful if the devices provide state information previously on the feedback channel and won’t store it locally."), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) ResponseEntity getControllerBase(@PathVariable("tenant") final String tenant, @@ -93,6 +126,17 @@ ResponseEntity getControllerBase(@PathVariable("tenant") fina * {@link HttpStatus#OK} or in case of partial download * {@link HttpStatus#PARTIAL_CONTENT}. */ + @Operation(summary = "Artifact download", description = "Handles GET DdiArtifact download request. This could be full or partial (as specified by RFC7233 (Range Requests)) download request.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target or Module not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/softwaremodules/{softwareModuleId}/artifacts/{fileName}") ResponseEntity downloadArtifact(@PathVariable("tenant") final String tenant, @@ -115,6 +159,17 @@ ResponseEntity downloadArtifact(@PathVariable("tenant") final Strin * @return {@link ResponseEntity} with status {@link HttpStatus#OK} if * successful */ + @Operation(summary = "MD5 checksum download", description = "Handles GET {@link DdiArtifact} MD5 checksum file download request.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target or Module not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/softwaremodules/{softwareModuleId}/artifacts/{fileName}" + DdiRestConstants.ARTIFACT_MD5_DWNL_SUFFIX, produces = MediaType.TEXT_PLAIN_VALUE) @@ -156,6 +211,20 @@ ResponseEntity downloadArtifactMd5(@PathVariable("tenant") final String te * * @return the response */ + @Operation(summary = "Resource for software module (Deployment Base)", description = """ + Core resource for deployment operations. Contains all information necessary in order to execute the operation. + + Keep in mind that the provided download links for the artifacts are generated dynamically by the update server. Host, port and path and not guaranteed to be similar to the provided examples below but will be defined at runtime. + """) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.DEPLOYMENT_BASE_ACTION + "/{actionId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) @@ -181,6 +250,23 @@ ResponseEntity getControllerBasedeploymentAction(@PathVariabl * * @return the response */ + @Operation(summary = "Feedback channel for the DeploymentBase action", description = """ + Feedback channel. It is up to the device how much intermediate feedback is provided. + However, the action will be kept open until the controller on the device reports a finished (either successful or error). + """) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "410", description = "Action is not active anymore.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.DEPLOYMENT_BASE_ACTION + "/{actionId}/" + DdiRestConstants.FEEDBACK, consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) @@ -200,6 +286,20 @@ ResponseEntity postBasedeploymentActionFeedback(@Valid final DdiActionFeed * * @return status of the request */ + @Operation(summary = "Feedback channel for the config data action", description = """ + The usual behaviour is that when a new device registers at the server it is requested to provide the meta information that will allow the server to identify the device on a hardware level (e.g. hardware revision, mac address, serial number etc.). + """) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIG_DATA_ACTION, consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) @@ -218,6 +318,18 @@ ResponseEntity putConfigData(@Valid final DdiConfigData configData, * * @return the {@link DdiCancel} response */ + @Operation(summary = "Cancel an action", description = """ + The Hawkbit server might cancel an operation, e.g. an unfinished update has a successor. It is up to the provisioning target to decide to accept the cancelation or reject it. + """) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CANCEL_ACTION + "/{actionId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) @@ -240,6 +352,20 @@ ResponseEntity getControllerCancelAction(@PathVariable("tenant") fina * * @return the {@link DdiActionFeedback} response */ + @Operation(summary = "Feedback channel for cancel actions", description = """ + It is up to the device how much intermediate feedback is provided. However, the action will be kept open until the controller on the device reports a finished (either successful or error) or rejects the action, e.g. the canceled actions have been started already. + """) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CANCEL_ACTION + "/{actionId}/" + DdiRestConstants.FEEDBACK, consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) @@ -279,6 +405,23 @@ ResponseEntity postCancelActionFeedback(@Valid final DdiActionFeedback fee * @return the {@link DdiDeploymentBase}. The response is of same format as * for the /deploymentBase resource. */ + @Operation(summary = "Previously installed action", description = """ + Resource to receive information of the previous installation. Can be used to re-retrieve artifacts of the already finished action, for example in case a re-installation is necessary. The response will be of the same format as the deploymentBase operation, providing the previous action that has been finished successfully. As the action is already finished, no further feedback is expected. + + Keep in mind that the provided download links for the artifacts are generated dynamically by the update server. Host, port and path are not guaranteed to be similar to the provided examples below but will be defined at runtime. + """) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = """ + The response body includes the detailed operation for the already finished action in the same format as for the deploymentBase operation. + + In this case the (optional) query for the last 10 messages, previously provided by the device, are included."""), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.INSTALLED_BASE_ACTION + "/{actionId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) @@ -300,6 +443,22 @@ ResponseEntity getControllerInstalledAction(@PathVariable("te * to check the state for * @return the state as {@link DdiAutoConfirmationState} */ + @Operation(summary = "Resource to request confirmation specific information for the controller", description = """ + Core resource for confirmation related operations. While active actions awaiting confirmation will be referenced, the current auto-confirmation status will be shown. In case auto-confirmation is active, details like the initiator, remark and date of activation (as unix timestamp) will be provided. + Reference links to switch the auto-confirmation state are exposed as well. + """) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = """ + The response body in case auto-confirmation is active is richer - it contains additional information + such as initiator, remark and when the auto-confirmation had been activated. + """), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) @@ -339,6 +498,21 @@ ResponseEntity getConfirmationBase(@PathVariable("tenant") * * @return the response */ + @Operation(summary = "Confirmation status of an action", description = """ + Resource to receive information about a pending confirmation. The response will be of the same format as the deploymentBase operation. The controller should provide feedback about the confirmation first, before processing the deployment. + + Keep in mind that the provided download links for the artifacts are generated dynamically by the update server. Host, port and path are not guaranteed to be similar to the provided examples below but will be defined at runtime. + """) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "The response body includes the detailed information about the action awaiting confirmation in the same format as for the deploymentBase operation."), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE + "/{actionId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) @@ -365,6 +539,22 @@ ResponseEntity getConfirmationBaseAction(@PathVariabl * * @return the response */ + @Operation(summary = "Feedback channel for actions waiting for confirmation", description = """ + The device will use this resource to either confirm or deny an action which is waiting for confirmation. The action will be transferred into the RUNNING state in case the device is confirming it. Afterwards it will be exposed by the deploymentBase. + """) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target or Action not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "410", description = "Action is not active anymore.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE + "/{actionId}/" + DdiRestConstants.FEEDBACK, consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) @@ -388,6 +578,21 @@ ResponseEntity postConfirmationActionFeedback(@Valid final DdiConfirmation * {@link org.springframework.http.HttpStatus#CONFLICT} in case * auto-confirmation was active already. */ + @Operation(summary = "Interface to activate auto-confirmation for a specific device", description = """ + The device can use this resource to activate auto-confirmation. As a result all current active as well as future actions will automatically be confirmed by mentioning the initiator as triggered person. Actions will be automatically confirmed, as long as auto-confirmation is active. + """) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE + "/" + DdiRestConstants.AUTO_CONFIRM_ACTIVATE, consumes = { MediaType.APPLICATION_JSON_VALUE, DdiRestConstants.MEDIA_TYPE_CBOR }) @@ -405,6 +610,21 @@ ResponseEntity activateAutoConfirmation(@PathVariable("tenant") final Stri * @return {@link org.springframework.http.HttpStatus#OK} if successfully * executed */ + @Operation(summary = "Interface to deactivate auto-confirmation for a specific controller", description = """ + The device can use this resource to deactivate auto-confirmation. All active actions will remain unchanged while all future actions need to be confirmed, before processing with the deployment. + """) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE + "/" + DdiRestConstants.AUTO_CONFIRM_DEACTIVATE) ResponseEntity deactivateAutoConfirmation(@PathVariable("tenant") final String tenant, diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionFeedbackTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionFeedbackTest.java index 0990059e41..fb758a86a8 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionFeedbackTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionFeedbackTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionHistoryTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionHistoryTest.java index fe4706946e..45bec09e9b 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionHistoryTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiActionHistoryTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactHashTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactHashTest.java index a3331d536b..a27e9c21e2 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactHashTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactHashTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactTest.java index ace7665c9f..2e8beecc3f 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiArtifactTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelActionToStopTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelActionToStopTest.java index 8e1d969a59..50cc60e085 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelActionToStopTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelActionToStopTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelTest.java index b4c583dfa9..05516d96a3 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiCancelTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiChunkTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiChunkTest.java index bb928337ef..31fc9977b3 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiChunkTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiChunkTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigDataTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigDataTest.java index e9212a51fc..261aaf8f46 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigDataTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigDataTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigTest.java index 3155703822..8deeded657 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfigTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBaseTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBaseTest.java index f9e34596f8..1954b0befd 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBaseTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiConfirmationBaseTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiControllerBaseTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiControllerBaseTest.java index 4f9902d5f5..a21d47e985 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiControllerBaseTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiControllerBaseTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentBaseTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentBaseTest.java index 23669b8a91..6ec7bf2a10 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentBaseTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentBaseTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentTest.java index a002795f1d..2eaae07cae 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiDeploymentTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiMetadataTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiMetadataTest.java index 959df1cc58..ad4a3b5d44 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiMetadataTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiMetadataTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiPollingTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiPollingTest.java index ee80580e62..5830ff9e7a 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiPollingTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiPollingTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiProgressTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiProgressTest.java index 15bf02b15a..3495ba2e1b 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiProgressTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiProgressTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiResultTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiResultTest.java index 99b446466f..4e562f1e2e 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiResultTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiResultTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiStatusTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiStatusTest.java index 4c7be4b374..6f7c28d786 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiStatusTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/DdiStatusTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/JsonIgnorePropertiesAnnotationTest.java b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/JsonIgnorePropertiesAnnotationTest.java index c2d6ee3d8c..674d8b3ffe 100644 --- a/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/JsonIgnorePropertiesAnnotationTest.java +++ b/hawkbit-rest/hawkbit-ddi-api/src/test/java/org/eclipse/hawkbit/ddi/json/model/JsonIgnorePropertiesAnnotationTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.json.model; diff --git a/hawkbit-rest/hawkbit-ddi-resource/pom.xml b/hawkbit-rest/hawkbit-ddi-resource/pom.xml index 45a96e57fb..0a5eb4e59c 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/pom.xml +++ b/hawkbit-rest/hawkbit-ddi-resource/pom.xml @@ -1,11 +1,12 @@ diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DataConversionHelper.java b/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DataConversionHelper.java index 19648527c8..c649263749 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DataConversionHelper.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DataConversionHelper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.rest.resource; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiApiConfiguration.java b/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiApiConfiguration.java index 7fa0b9bb92..7480e4aa36 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiApiConfiguration.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiApiConfiguration.java @@ -1,13 +1,15 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.rest.resource; +import org.eclipse.hawkbit.rest.OpenApiConfiguration; import org.eclipse.hawkbit.rest.RestConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -21,7 +23,7 @@ */ @Configuration @ComponentScan -@Import(RestConfiguration.class) +@Import({RestConfiguration.class, OpenApiConfiguration.class}) public class DdiApiConfiguration { } diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java b/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java index 5e6286ac5d..95def799a9 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/main/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.rest.resource; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/AbstractDDiApiIntegrationTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/AbstractDDiApiIntegrationTest.java index 7989e8ce8a..0e436ca71f 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/AbstractDDiApiIntegrationTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/AbstractDDiApiIntegrationTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.rest.resource; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java index d9b36c04fd..a578381989 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiArtifactDownloadTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.rest.resource; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiCancelActionTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiCancelActionTest.java index 34d7722254..ff88480c6f 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiCancelActionTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiCancelActionTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.rest.resource; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java index f01cebf471..7e3c05de0c 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfigDataTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.rest.resource; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfirmationBaseTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfirmationBaseTest.java index 1785c3e92a..2a62c80beb 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfirmationBaseTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiConfirmationBaseTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.rest.resource; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java index a8c9a52ddb..492da3efa2 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiDeploymentBaseTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.rest.resource; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiInstalledBaseTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiInstalledBaseTest.java index 74f8ae31c4..8805874a50 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiInstalledBaseTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiInstalledBaseTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.rest.resource; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootControllerTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootControllerTest.java index 10bd928ad7..588680f576 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootControllerTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DdiRootControllerTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.rest.resource; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DosFilterTest.java b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DosFilterTest.java index 7271f0959e..2db999945f 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DosFilterTest.java +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/java/org/eclipse/hawkbit/ddi/rest/resource/DosFilterTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ddi.rest.resource; diff --git a/hawkbit-rest/hawkbit-ddi-resource/src/test/resources/ddi-test.properties b/hawkbit-rest/hawkbit-ddi-resource/src/test/resources/ddi-test.properties index 5a734bd884..6205e64068 100644 --- a/hawkbit-rest/hawkbit-ddi-resource/src/test/resources/ddi-test.properties +++ b/hawkbit-rest/hawkbit-ddi-resource/src/test/resources/ddi-test.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. +# Copyright (c) 2015 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # DDI configuration - START diff --git a/hawkbit-rest/hawkbit-mgmt-api/pom.xml b/hawkbit-rest/hawkbit-mgmt-api/pom.xml index b7d3bcb04c..9b9f746398 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/pom.xml +++ b/hawkbit-rest/hawkbit-mgmt-api/pom.xml @@ -1,11 +1,12 @@ hawkBit :: REST :: Management API + + + org.eclipse.hawkbit + hawkbit-rest-core + ${project.version} + + org.springframework.hateoas spring-hateoas + + + org.springdoc + springdoc-openapi-ui + ${springdoc-openapi.version} + + + org.springdoc + springdoc-openapi-security + ${springdoc-openapi.version} + + org.springframework spring-webmvc diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtBaseEntity.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtBaseEntity.java index 1013eb305e..3f5c2be7ee 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtBaseEntity.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtBaseEntity.java @@ -1,13 +1,15 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model; +import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.hateoas.Link; import org.springframework.hateoas.RepresentationModel; @@ -21,15 +23,19 @@ public abstract class MgmtBaseEntity extends RepresentationModel { @JsonProperty + @Schema(example = "bumlux") private String createdBy; @JsonProperty + @Schema(example = "1691065905897") private Long createdAt; @JsonProperty + @Schema(example = "bumlux") private String lastModifiedBy; @JsonProperty + @Schema(example = "1691065906407") private Long lastModifiedAt; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtId.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtId.java index f87f36ca64..5b91ff38d2 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtId.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtId.java @@ -1,15 +1,17 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import io.swagger.v3.oas.annotations.media.Schema; /** * A generic abstract rest model which contains only a ID for use-case e.g. @@ -19,6 +21,7 @@ */ @JsonIgnoreProperties(ignoreUnknown = true) public class MgmtId { + @Schema(example = "108") private Long id; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMaintenanceWindow.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMaintenanceWindow.java index 9e7627add7..e5dd5d48d2 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMaintenanceWindow.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMaintenanceWindow.java @@ -1,10 +1,11 @@ /** - * Copyright (c) Siemens AG, 2018 + * Copyright (c) 2018 Siemens AG * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMaintenanceWindowRequestBody.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMaintenanceWindowRequestBody.java index 411af69c5d..aee73842af 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMaintenanceWindowRequestBody.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMaintenanceWindowRequestBody.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model; @@ -12,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Request body for maintenance window PUT/POST commands, based on a schedule @@ -23,12 +25,15 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class MgmtMaintenanceWindowRequestBody { @JsonProperty + @Schema(example = "10 12 14 3 8 ? 2023") private String schedule; @JsonProperty + @Schema(example = "00:10:00") private String duration; @JsonProperty + @Schema(example = "+00:00") private String timezone; public String getSchedule() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMetadata.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMetadata.java index 73bd372c37..81129eb2e1 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMetadata.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMetadata.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model; @@ -12,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * The representation of an meta data in the REST API for POST/Create. @@ -22,8 +24,10 @@ public class MgmtMetadata { @JsonProperty(required = true) + @Schema(example = "someKnownKey") private String key; @JsonProperty + @Schema(example = "someKnownKeyValue") private String value; public String getKey() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMetadataBodyPut.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMetadataBodyPut.java index eaf7e8ca85..9334ba6876 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMetadataBodyPut.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtMetadataBodyPut.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model; @@ -12,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * The representation of an meta data in the REST API for PUT/Update. @@ -22,6 +24,7 @@ public class MgmtMetadataBodyPut { @JsonProperty + @Schema(example = "someValue") private String value; public String getValue() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtNamedEntity.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtNamedEntity.java index d335261ad9..e404051ed3 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtNamedEntity.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtNamedEntity.java @@ -1,14 +1,16 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * A json annotated rest model for NamedEntity to RESTful API representation. @@ -17,9 +19,11 @@ public abstract class MgmtNamedEntity extends MgmtBaseEntity { @JsonProperty(required = true) + @Schema(example = "Name of entity") private String name; @JsonProperty + @Schema(example = "Description of entity") private String description; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtPollStatus.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtPollStatus.java index 5e5163a6a9..bef85bce79 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtPollStatus.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/MgmtPollStatus.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model; @@ -12,6 +13,9 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; + +import static org.checkerframework.checker.units.qual.Prefix.exa; /** * A json annotated rest model for PollStatus to RESTful API representation. @@ -25,12 +29,15 @@ public class MgmtPollStatus { @JsonProperty + @Schema(example = "1691065941102") private Long lastRequestAt; @JsonProperty + @Schema(example = "1691109141102") private Long nextExpectedRequestAt; @JsonProperty + @Schema(example = "false") private boolean overdue; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/PagedList.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/PagedList.java index a1009e9bff..f17102b089 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/PagedList.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/PagedList.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtAction.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtAction.java index a86a7ef4b8..980078b6cd 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtAction.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtAction.java @@ -1,13 +1,15 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.action; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.MgmtBaseEntity; import org.eclipse.hawkbit.mgmt.json.model.MgmtMaintenanceWindow; import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType; @@ -46,36 +48,46 @@ public class MgmtAction extends MgmtBaseEntity { public static final String ACTION_PENDING = "pending"; @JsonProperty("id") + @Schema(example = "7") private Long actionId; @JsonProperty + @Schema(example = "update") private String type; @JsonProperty + @Schema(example = "finished") private String status; @JsonProperty + @Schema(example = "finished") private String detailStatus; @JsonProperty + @Schema(example = "1691065903238") private Long forceTime; @JsonProperty(value = "forceType") private MgmtActionType actionType; @JsonProperty + @Schema(example = "600") private Integer weight; @JsonProperty + @Schema(hidden = true) private MgmtMaintenanceWindow maintenanceWindow; @JsonProperty + @Schema(example = "1") private Long rollout; @JsonProperty + @Schema(example = "rollout") private String rolloutName; @JsonProperty + @Schema(example = "200") private Integer lastStatusCode; public MgmtMaintenanceWindow getMaintenanceWindow() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtActionRequestBodyPut.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtActionRequestBodyPut.java index d7b7ee8fde..ededebd890 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtActionRequestBodyPut.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtActionRequestBodyPut.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.action; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtActionStatus.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtActionStatus.java index ce40e877e3..05405ec9a5 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtActionStatus.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/action/MgmtActionStatus.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.action; @@ -14,6 +15,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * A json annotated rest model for ActionStatus to RESTful API representation. @@ -24,18 +26,22 @@ public class MgmtActionStatus { @JsonProperty("id") + @Schema(example = "21") private Long statusId; @JsonProperty + @Schema(example = "running") private String type; @JsonProperty private List messages; @JsonProperty + @Schema(example = "1691065929524") private Long reportedAt; @JsonProperty + @Schema(example = "200") private Integer code; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/artifact/MgmtArtifact.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/artifact/MgmtArtifact.java index c0bf8998b5..1d8a1edf17 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/artifact/MgmtArtifact.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/artifact/MgmtArtifact.java @@ -1,13 +1,15 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.artifact; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.MgmtBaseEntity; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -24,15 +26,18 @@ public class MgmtArtifact extends MgmtBaseEntity { @JsonProperty("id") + @Schema(example = "3") private Long artifactId; @JsonProperty private MgmtArtifactHash hashes; @JsonProperty + @Schema(example = "file1") private String providedFilename; @JsonProperty + @Schema(example = "3") private Long size; public MgmtArtifact() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/artifact/MgmtArtifactHash.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/artifact/MgmtArtifactHash.java index db5e427339..37d46d56c3 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/artifact/MgmtArtifactHash.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/artifact/MgmtArtifactHash.java @@ -1,14 +1,16 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.artifact; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Hashes for given Artifact. @@ -18,12 +20,15 @@ public class MgmtArtifactHash { @JsonProperty + @Schema(example = "2d86c2a659e364e9abba49ea6ffcd53dd5559f05") private String sha1; @JsonProperty + @Schema(example = "0d1b08c34858921bc7c662b228acb7ba") private String md5; @JsonProperty + @Schema(example = "a03b221c6c6eae7122ca51695d456d5222e524889136394944b2f9763b483615") private String sha256; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/auth/MgmtUserInfo.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/auth/MgmtUserInfo.java index 0ebba16052..c5a8ef83f6 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/auth/MgmtUserInfo.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/auth/MgmtUserInfo.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.auth; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtActionId.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtActionId.java index 40bbf94b37..319ca8d82e 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtActionId.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtActionId.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionset; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtActionType.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtActionType.java index 0601b954aa..958c529432 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtActionType.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtActionType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionset; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtCancelationType.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtCancelationType.java index a7f6db4b19..ba29437045 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtCancelationType.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtCancelationType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionset; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSet.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSet.java index 3bc5a55074..429be0568c 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSet.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSet.java @@ -1,16 +1,18 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionset; import java.util.ArrayList; import java.util.List; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity; import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModule; @@ -29,30 +31,38 @@ public class MgmtDistributionSet extends MgmtNamedEntity { @JsonProperty(value = "id", required = true) + @Schema(example = "51") private Long dsId; @JsonProperty + @Schema(example = "1.4.2") private String version; @JsonProperty private List modules = new ArrayList<>(); @JsonProperty + @Schema(example = "false") private boolean requiredMigrationStep; @JsonProperty + @Schema(example = "test_default_ds_type") private String type; @JsonProperty + @Schema(example = "OS (FW) mandatory, runtime (FW) and app (SW) optional") private String typeName; @JsonProperty + @Schema(example = "true") private Boolean complete; @JsonProperty + @Schema(example = "false") private boolean deleted; @JsonProperty + @Schema(example = "true") private boolean valid; public boolean isValid() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetRequestBodyPost.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetRequestBodyPost.java index 906647199c..6a0d1cdaec 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetRequestBodyPost.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetRequestBodyPost.java @@ -1,15 +1,17 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionset; import java.util.List; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleAssigment; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -28,12 +30,15 @@ public class MgmtDistributionSetRequestBodyPost extends MgmtDistributionSetReque // deprecated format from the time where os, application and runtime where // statically defined @JsonProperty + @Schema(hidden = true) private MgmtSoftwareModuleAssigment os; @JsonProperty + @Schema(hidden = true) private MgmtSoftwareModuleAssigment runtime; @JsonProperty + @Schema(hidden = true) private MgmtSoftwareModuleAssigment application; // deprecated format - END @@ -41,6 +46,7 @@ public class MgmtDistributionSetRequestBodyPost extends MgmtDistributionSetReque private List modules; @JsonProperty + @Schema(example = "test_default_ds_type") private String type; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetRequestBodyPut.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetRequestBodyPut.java index 8f3200cb4f..056778a40e 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetRequestBodyPut.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetRequestBodyPut.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionset; @@ -12,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * A json annotated rest model for DistributionSet for PUT/POST. @@ -22,15 +24,19 @@ public class MgmtDistributionSetRequestBodyPut { @JsonProperty + @Schema(example = "dsOne") private String name; @JsonProperty + @Schema(example = "Description of the distribution set.") private String description; @JsonProperty + @Schema(example = "1.0.0") private String version; @JsonProperty + @Schema(example = "false") private Boolean requiredMigrationStep; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetStatistics.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetStatistics.java index fdf40e4562..e23b120bc2 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetStatistics.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtDistributionSetStatistics.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2023 Bosch.IO GmbH and others. + * Copyright (c) 2023 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionset; @@ -12,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; import java.util.HashMap; import java.util.Map; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtInvalidateDistributionSetRequestBody.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtInvalidateDistributionSetRequestBody.java index 41a57ab2ac..4ce65b1411 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtInvalidateDistributionSetRequestBody.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtInvalidateDistributionSetRequestBody.java @@ -1,16 +1,18 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionset; import javax.validation.constraints.NotNull; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * A json annotated rest model for invalidate DistributionSet requests. @@ -22,6 +24,7 @@ public class MgmtInvalidateDistributionSetRequestBody { @JsonProperty private MgmtCancelationType actionCancelationType; @JsonProperty + @Schema(example = "true") private boolean cancelRollouts; public MgmtCancelationType getActionCancelationType() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentRequestBody.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentRequestBody.java index 1ed914f663..7512bf3b69 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentRequestBody.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentRequestBody.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionset; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBody.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBody.java index c0ede38645..323b625e70 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBody.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBody.java @@ -1,16 +1,18 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionset; import java.util.List; import java.util.Objects; +import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.hateoas.RepresentationModel; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetType.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetType.java index 591de724b1..bebd7e4c1f 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetType.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetType.java @@ -1,13 +1,15 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionsettype; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -28,15 +30,19 @@ public class MgmtDistributionSetType extends MgmtNamedEntity { @JsonProperty(value = "id", required = true) + @Schema(example = "99") private Long moduleId; @JsonProperty(required = true) + @Schema(example = "os_app") private String key; @JsonProperty + @Schema(example = "false") private boolean deleted; @JsonProperty + @Schema(example = "black") private String colour; public boolean isDeleted() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetTypeAssignment.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetTypeAssignment.java index c838c98497..ee5e3f078a 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetTypeAssignment.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetTypeAssignment.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionsettype; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetTypeRequestBodyPost.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetTypeRequestBodyPost.java index e0f6f5d22e..8119eb506f 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetTypeRequestBodyPost.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetTypeRequestBodyPost.java @@ -1,15 +1,17 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionsettype; import java.util.List; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleTypeAssigment; import com.fasterxml.jackson.annotation.JsonProperty; @@ -21,9 +23,11 @@ public class MgmtDistributionSetTypeRequestBodyPost extends MgmtDistributionSetTypeRequestBodyPut { @JsonProperty(required = true) + @Schema(example = "Example type name") private String name; @JsonProperty(required = true) + @Schema(example = "Example key") private String key; @JsonProperty diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetTypeRequestBodyPut.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetTypeRequestBodyPut.java index 1d3d0feb60..3ac0247df1 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetTypeRequestBodyPut.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/distributionsettype/MgmtDistributionSetTypeRequestBodyPut.java @@ -1,14 +1,16 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionsettype; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Request Body for DistributionSetType PUT, i.e. update. @@ -17,9 +19,11 @@ public class MgmtDistributionSetTypeRequestBodyPut { @JsonProperty + @Schema(example = "Example description") private String description; @JsonProperty + @Schema(example = "rgb(86,37,99)") private String colour; public String getDescription() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/AbstractMgmtRolloutConditionsEntity.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/AbstractMgmtRolloutConditionsEntity.java index ee33fe9b88..3f6195e93a 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/AbstractMgmtRolloutConditionsEntity.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/AbstractMgmtRolloutConditionsEntity.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.rollout; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutCondition.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutCondition.java index 75d11c344f..014d3fd90d 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutCondition.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutCondition.java @@ -1,16 +1,18 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.rollout; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; +import io.swagger.v3.oas.annotations.media.Schema; /** * @@ -20,6 +22,7 @@ public class MgmtRolloutCondition { private Condition condition = Condition.THRESHOLD; + @Schema(example = "50") private String expression = "100"; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutErrorAction.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutErrorAction.java index db34044f49..1d727faf34 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutErrorAction.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutErrorAction.java @@ -1,16 +1,18 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.rollout; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; +import io.swagger.v3.oas.annotations.media.Schema; /** * An action that runs when the error condition is met @@ -20,6 +22,7 @@ public class MgmtRolloutErrorAction { private ErrorAction action = ErrorAction.PAUSE; + @Schema(example = "80") private String expression; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutResponseBody.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutResponseBody.java index 762fe4f878..3d8d4d4020 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutResponseBody.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutResponseBody.java @@ -1,16 +1,18 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.rollout; import java.util.HashMap; import java.util.Map; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity; import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType; @@ -26,43 +28,55 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class MgmtRolloutResponseBody extends MgmtNamedEntity { + @Schema(example = "controllerId==exampleTarget*") private String targetFilterQuery; + @Schema(example = "2") private Long distributionSetId; @JsonProperty(value = "id", required = true) + @Schema(example = "2") private Long rolloutId; @JsonProperty(required = true) + @Schema(example = "ready") private String status; @JsonProperty(required = true) + @Schema(example = "20") private Long totalTargets; @JsonProperty private Map totalTargetsPerStatus; @JsonProperty + @Schema(example = "5") private Integer totalGroups; @JsonProperty + @Schema(example = "1691065753136") private Long startAt; @JsonProperty + @Schema(example = "1691065762496") private Long forcetime; @JsonProperty + @Schema(example = "false") private boolean deleted; @JsonProperty private MgmtActionType type; @JsonProperty + @Schema(example = "400") private Integer weight; @JsonProperty + @Schema(example = "Approved remark.") private String approvalRemark; @JsonProperty + @Schema(example = "exampleUsername") private String approveDecidedBy; public boolean isDeleted() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutRestRequestBody.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutRestRequestBody.java index 7ce5ba8136..74692acc3e 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutRestRequestBody.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutRestRequestBody.java @@ -1,16 +1,18 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.rollout; import java.util.List; import java.util.Optional; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType; import org.eclipse.hawkbit.mgmt.json.model.rolloutgroup.MgmtRolloutGroup; @@ -27,19 +29,26 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class MgmtRolloutRestRequestBody extends AbstractMgmtRolloutConditionsEntity { + @Schema(example = "id==targets-*") private String targetFilterQuery; + @Schema(example = "6") private long distributionSetId; + @Schema(example = "5") private Integer amountGroups; + @Schema(example = "1691065781929") private Long forcetime; + @Schema(example = "1691065780929") private Long startAt; @JsonProperty(required = false) + @Schema(example = "400") private Integer weight; @JsonProperty(required = false) + @Schema(example = "false") private Boolean confirmationRequired; private MgmtActionType type; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutSuccessAction.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutSuccessAction.java index 3d64150589..67e13ab699 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutSuccessAction.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rollout/MgmtRolloutSuccessAction.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.rollout; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroup.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroup.java index 8a8f48b574..378973ac32 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroup.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroup.java @@ -1,13 +1,15 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.rolloutgroup; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.rollout.AbstractMgmtRolloutConditionsEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -20,8 +22,11 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class MgmtRolloutGroup extends AbstractMgmtRolloutConditionsEntity { + @Schema(example = "controllerId==exampleTarget*") private String targetFilterQuery; + @Schema(example = "20.0") private Float targetPercentage; + @Schema(example = "false") private Boolean confirmationRequired; public String getTargetFilterQuery() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroupResponseBody.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroupResponseBody.java index 8cd1d5a729..41ed75a790 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroupResponseBody.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/rolloutgroup/MgmtRolloutGroupResponseBody.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.rolloutgroup; @@ -15,6 +16,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Model for the rollout group annotated with json-annotations for easier @@ -25,11 +27,14 @@ public class MgmtRolloutGroupResponseBody extends MgmtRolloutGroup { @JsonProperty(value = "id", required = true) + @Schema(example = "63") private Long rolloutGroupId; @JsonProperty(required = true) + @Schema(example = "ready") private String status; + @Schema(example = "4") private int totalTargets; private Map totalTargetsPerStatus; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModule.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModule.java index da722bd211..1bbb39e134 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModule.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModule.java @@ -1,13 +1,15 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.softwaremodule; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -24,23 +26,30 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class MgmtSoftwareModule extends MgmtNamedEntity { @JsonProperty(value = "id", required = true) + @Schema(example = "6") private Long moduleId; @JsonProperty(required = true) + @Schema(example = "1.0.0") private String version; @JsonProperty(required = true) + @Schema(example = "os") private String type; + @Schema(example = "OS") private String typeName; @JsonProperty + @Schema(example = "Vendor Limited, California") private String vendor; @JsonProperty + @Schema(example = "false") private boolean deleted; @JsonProperty + @Schema(example = "false") private boolean encrypted; public void setDeleted(final boolean deleted) { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleAssigment.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleAssigment.java index 79bc31ad37..7455a6626a 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleAssigment.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleAssigment.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.softwaremodule; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleMetadata.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleMetadata.java index 01750d26d3..553ca9190e 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleMetadata.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleMetadata.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.softwaremodule; @@ -12,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * The representation of SoftwareModuleMetadata in the REST API for POST/Create. @@ -22,10 +24,13 @@ public class MgmtSoftwareModuleMetadata { @JsonProperty(required = true) + @Schema(example = "someKnownKey") private String key; @JsonProperty + @Schema(example = "someKnownValue") private String value; @JsonProperty + @Schema(example = "false") private boolean targetVisible; public String getKey() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleMetadataBodyPut.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleMetadataBodyPut.java index 67d6b39b1b..1ea6080f8c 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleMetadataBodyPut.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleMetadataBodyPut.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.softwaremodule; @@ -12,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * The representation of an meta data in the REST API for PUT/Update. @@ -22,8 +24,10 @@ public class MgmtSoftwareModuleMetadataBodyPut { @JsonProperty + @Schema(example = "newValue") private String value; @JsonProperty + @Schema(example = "true") private Boolean targetVisible; public String getValue() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleRequestBodyPost.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleRequestBodyPost.java index c3a29d2dcc..11fdd841f9 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleRequestBodyPost.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleRequestBodyPost.java @@ -1,14 +1,16 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.softwaremodule; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Request Body for SoftwareModule POST. @@ -17,21 +19,27 @@ public class MgmtSoftwareModuleRequestBodyPost { @JsonProperty(required = true) + @Schema(example = "SM Name") private String name; @JsonProperty(required = true) + @Schema(example = "1.0.0") private String version; @JsonProperty(required = true) + @Schema(example = "os") private String type; @JsonProperty + @Schema(example = "SM Description") private String description; @JsonProperty + @Schema(example = "Vendor Limited, California") private String vendor; @JsonProperty + @Schema(example = "false") private boolean encrypted; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleRequestBodyPut.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleRequestBodyPut.java index 52c097e397..75a1368683 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleRequestBodyPut.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremodule/MgmtSoftwareModuleRequestBodyPut.java @@ -1,14 +1,16 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.softwaremodule; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Request Body for SoftwareModule PUT. @@ -17,9 +19,11 @@ public class MgmtSoftwareModuleRequestBodyPut { @JsonProperty + @Schema(example = "SM Description") private String description; @JsonProperty + @Schema(example = "SM Vendor Name") private String vendor; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleType.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleType.java index ef95643697..68af185f43 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleType.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleType.java @@ -1,13 +1,15 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -25,18 +27,23 @@ public class MgmtSoftwareModuleType extends MgmtNamedEntity { @JsonProperty(value = "id", required = true) + @Schema(example = "83") private Long moduleId; @JsonProperty(required = true) + @Schema(example = "OS") private String key; @JsonProperty + @Schema(example = "1") private int maxAssignments; @JsonProperty + @Schema(example = "false") private boolean deleted; @JsonProperty + @Schema(example = "brown") private String colour; public boolean isDeleted() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeAssigment.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeAssigment.java index d590d94703..30d623e6c2 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeAssigment.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeAssigment.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeRequestBodyPost.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeRequestBodyPost.java index 4aa46d70cc..fcf1cd4247 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeRequestBodyPost.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeRequestBodyPost.java @@ -1,14 +1,16 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Request Body for SoftwareModuleType POST. @@ -17,12 +19,15 @@ public class MgmtSoftwareModuleTypeRequestBodyPost extends MgmtSoftwareModuleTypeRequestBodyPut { @JsonProperty(required = true) + @Schema(example = "Example name") private String name; @JsonProperty(required = true) + @Schema(example = "Example key") private String key; @JsonProperty + @Schema(example = "1") private int maxAssignments; @Override diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeRequestBodyPut.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeRequestBodyPut.java index a899f7afa6..a1977eb5b5 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeRequestBodyPut.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/softwaremoduletype/MgmtSoftwareModuleTypeRequestBodyPut.java @@ -1,14 +1,16 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Request Body for SoftwareModuleType PUT. @@ -17,9 +19,11 @@ public class MgmtSoftwareModuleTypeRequestBodyPut { @JsonProperty + @Schema(example = "Example description") private String description; @JsonProperty + @Schema(example = "rgb(0,0,255") private String colour; public String getDescription() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/system/MgmtSystemTenantConfigurationValue.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/system/MgmtSystemTenantConfigurationValue.java index 7c2e33a0f0..d513678386 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/system/MgmtSystemTenantConfigurationValue.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/system/MgmtSystemTenantConfigurationValue.java @@ -1,14 +1,16 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.system; +import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.hateoas.RepresentationModel; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -25,14 +27,22 @@ public class MgmtSystemTenantConfigurationValue extends RepresentationModel { @JsonInclude(Include.ALWAYS) + @Schema(example = "true") private Object value; @JsonInclude(Include.ALWAYS) + @Schema(example = "true") private boolean isGlobal = true; + @Schema(example = "1623085150") private Long lastModifiedAt; + + @Schema(example = "example user") private String lastModifiedBy; + + @Schema(example = "1523085150") private Long createdAt; + @Schema(example = "example user") private String createdBy; public Object getValue() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/system/MgmtSystemTenantConfigurationValueRequest.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/system/MgmtSystemTenantConfigurationValueRequest.java index 5c160b0fb0..89912f5b0e 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/system/MgmtSystemTenantConfigurationValueRequest.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/system/MgmtSystemTenantConfigurationValueRequest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.system; @@ -14,6 +15,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * A json annotated rest model for System Configuration for PUT. @@ -23,6 +25,7 @@ public class MgmtSystemTenantConfigurationValueRequest { @JsonProperty(required = true) + @Schema(example = "exampleToken") private Serializable value; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemCache.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemCache.java index 2876b11dfc..b285d6fce4 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemCache.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemCache.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.systemmanagement; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemStatisticsRest.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemStatisticsRest.java index 5c8295f069..41eacc08e2 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemStatisticsRest.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemStatisticsRest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.systemmanagement; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemTenantServiceUsage.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemTenantServiceUsage.java index 5d26f4fd04..52cf091e6b 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemTenantServiceUsage.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/systemmanagement/MgmtSystemTenantServiceUsage.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.systemmanagement; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedDistributionSetRequestBody.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedDistributionSetRequestBody.java index 4c004b206e..20a406fe61 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedDistributionSetRequestBody.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedDistributionSetRequestBody.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.tag; @@ -12,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Request Body for PUT. @@ -22,6 +24,7 @@ public class MgmtAssignedDistributionSetRequestBody { @JsonProperty(value = "id", required = true) + @Schema(example = "24") private Long distributionSetId; public Long getDistributionSetId() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedTargetRequestBody.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedTargetRequestBody.java index 6df1d10d7c..4879a7a92f 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedTargetRequestBody.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtAssignedTargetRequestBody.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.tag; @@ -12,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Request Body for PUT. @@ -22,6 +24,7 @@ public class MgmtAssignedTargetRequestBody { @JsonProperty(required = true) + @Schema(example = "Target1") private String controllerId; public String getControllerId() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtDistributionSetTagAssigmentResult.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtDistributionSetTagAssigmentResult.java index 892bac4538..b107b19e55 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtDistributionSetTagAssigmentResult.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtDistributionSetTagAssigmentResult.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.tag; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTag.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTag.java index 82c33b4347..b7a598103a 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTag.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTag.java @@ -1,13 +1,15 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.tag; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -25,9 +27,11 @@ public class MgmtTag extends MgmtNamedEntity { @JsonProperty(value = "id", required = true) + @Schema(example = "2") private Long tagId; @JsonProperty + @Schema(example = "rgb(255,0,0)") private String colour; @JsonIgnore diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTagRequestBodyPut.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTagRequestBodyPut.java index e7037af2b9..3cef3dfe7c 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTagRequestBodyPut.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTagRequestBodyPut.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.tag; @@ -12,6 +13,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Request Body for PUT/POST. @@ -22,12 +24,15 @@ public class MgmtTagRequestBodyPut { @JsonProperty + @Schema(example = "rgb(0,255,0)") private String colour; @JsonProperty + @Schema(example = "Example name") private String name; @JsonProperty + @Schema(example = "Example description") private String description; public String getName() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTargetTagAssigmentResult.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTargetTagAssigmentResult.java index 61625e59d3..96b931719f 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTargetTagAssigmentResult.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/tag/MgmtTargetTagAssigmentResult.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.tag; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignment.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignment.java index e076213933..f1d5ebab39 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignment.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignment.java @@ -3,6 +3,7 @@ */ package org.eclipse.hawkbit.mgmt.json.model.target; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.MgmtId; import org.eclipse.hawkbit.mgmt.json.model.MgmtMaintenanceWindowRequestBody; import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType; @@ -16,10 +17,13 @@ */ public class MgmtDistributionSetAssignment extends MgmtId { + @Schema(example = "1691065930359") private long forcetime; @JsonProperty(required = false) + @Schema(example = "23") private Integer weight; @JsonProperty(required = false) + @Schema(example = "false") private Boolean confirmationRequired; private MgmtActionType type; private MgmtMaintenanceWindowRequestBody maintenanceWindow; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignments.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignments.java index d58f390ba2..359b173be1 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignments.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignments.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.target; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignmentsDeserializer.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignmentsDeserializer.java index c9a6bda952..fb2672bb85 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignmentsDeserializer.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtDistributionSetAssignmentsDeserializer.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.target; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTarget.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTarget.java index 57adb7abc7..2e77d384bd 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTarget.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTarget.java @@ -5,6 +5,7 @@ import java.net.URI; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity; import org.eclipse.hawkbit.mgmt.json.model.MgmtPollStatus; @@ -23,42 +24,53 @@ public class MgmtTarget extends MgmtNamedEntity { @JsonProperty(required = true) + @Schema(example = "123") private String controllerId; @JsonProperty + @Schema(example = "in_sync") private String updateStatus; @JsonProperty + @Schema(example = "1691065941102") private Long lastControllerRequestAt; @JsonProperty + @Schema(example = "1691065941155") private Long installedAt; @JsonProperty + @Schema(example = "192.168.0.1") private String ipAddress; @JsonProperty + @Schema(example = "http://192.168.0.1") private String address; @JsonProperty private MgmtPollStatus pollStatus; @JsonProperty + @Schema(example = "38e6a19932b014040ba061795186514e") private String securityToken; @JsonProperty + @Schema(example = "true") private boolean requestAttributes; @JsonProperty private boolean isCleanedUp; @JsonProperty + @Schema(example = "19") private Long targetType; @JsonProperty + @Schema(example = "defaultType") private String targetTypeName; @JsonProperty + @Schema(example = "false") private Boolean autoConfirmActive; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTargetAutoConfirm.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTargetAutoConfirm.java index 2dde12c5a2..816c9683cf 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTargetAutoConfirm.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTargetAutoConfirm.java @@ -1,16 +1,18 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.target; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.hateoas.RepresentationModel; import javax.validation.constraints.NotNull; @@ -23,9 +25,13 @@ @JsonPropertyOrder({ "active", "initiator", "remark", "activatedAt" }) public class MgmtTargetAutoConfirm extends RepresentationModel { @NotNull + @Schema(example = "true") private boolean active; + @Schema(example = "custom_initiator_value") private String initiator; + @Schema(example = "custom_remark") private String remark; + @Schema(example = "1691065938576") private Long activatedAt; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTargetAutoConfirmUpdate.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTargetAutoConfirmUpdate.java index a8dd77b089..57a0cace8b 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTargetAutoConfirmUpdate.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTargetAutoConfirmUpdate.java @@ -1,24 +1,28 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.target; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Payload to activate the auto-confirmation by given initiator and remark. */ public class MgmtTargetAutoConfirmUpdate { @JsonProperty(required = false) + @Schema(example = "custom_initiator_value") private final String initiator; @JsonProperty(required = false) + @Schema(example = "custom_remark") private final String remark; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTargetRequestBody.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTargetRequestBody.java index 2c7541f0ff..3ca965bfdf 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTargetRequestBody.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/target/MgmtTargetRequestBody.java @@ -4,6 +4,7 @@ package org.eclipse.hawkbit.mgmt.json.model.target; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Request body for target PUT/POST commands. @@ -11,23 +12,30 @@ */ public class MgmtTargetRequestBody { @JsonProperty(required = true) + @Schema(example = "controllerName") private String name; + @Schema(example = "Example description of a target") private String description; @JsonProperty(required = true) + @Schema(example = "12345") private String controllerId; @JsonProperty + @Schema(example = "https://192.168.0.1") private String address; @JsonProperty + @Schema(example = "2345678DGGDGFTDzztgf") private String securityToken; @JsonProperty + @Schema(example = "false") private Boolean requestAttributes; @JsonProperty + @Schema(example = "10") private Long targetType; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targetfilter/MgmtDistributionSetAutoAssignment.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targetfilter/MgmtDistributionSetAutoAssignment.java index 48f2a726e4..7b5c8f09d8 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targetfilter/MgmtDistributionSetAutoAssignment.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targetfilter/MgmtDistributionSetAutoAssignment.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.targetfilter; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targetfilter/MgmtTargetFilterQuery.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targetfilter/MgmtTargetFilterQuery.java index ecbd728be3..b5d62c02b6 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targetfilter/MgmtTargetFilterQuery.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targetfilter/MgmtTargetFilterQuery.java @@ -1,13 +1,15 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.targetfilter; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.MgmtBaseEntity; import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType; @@ -26,24 +28,30 @@ public class MgmtTargetFilterQuery extends MgmtBaseEntity { @JsonProperty(value = "id", required = true) + @Schema(example = "2") private Long filterId; @JsonProperty + @Schema(example = "filterName") private String name; @JsonProperty + @Schema(example = "name==*") private String query; @JsonProperty + @Schema(example = "15") private Long autoAssignDistributionSet; @JsonProperty private MgmtActionType autoAssignActionType; @JsonProperty + @Schema(example = "") private Integer autoAssignWeight; @JsonProperty + @Schema(example = "false") private Boolean confirmationRequired; public Long getFilterId() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targetfilter/MgmtTargetFilterQueryRequestBody.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targetfilter/MgmtTargetFilterQueryRequestBody.java index c0c25ba88e..a3d2224f7e 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targetfilter/MgmtTargetFilterQueryRequestBody.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targetfilter/MgmtTargetFilterQueryRequestBody.java @@ -1,14 +1,16 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.targetfilter; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Request body for target PUT/POST commands. @@ -16,9 +18,11 @@ */ public class MgmtTargetFilterQueryRequestBody { @JsonProperty(required = true) + @Schema(example = "filterName") private String name; @JsonProperty(required = true) + @Schema(example = "controllerId==example-target-*") private String query; public String getName() { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targettype/MgmtTargetType.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targettype/MgmtTargetType.java index 9d1c81bc8a..0053965985 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targettype/MgmtTargetType.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targettype/MgmtTargetType.java @@ -1,16 +1,18 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.targettype; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; import org.eclipse.hawkbit.mgmt.json.model.MgmtNamedEntity; /** @@ -23,9 +25,11 @@ public class MgmtTargetType extends MgmtNamedEntity { @JsonProperty(value = "id", required = true) + @Schema(example = "26") private Long typeId; @JsonProperty + @Schema(example = "rgb(255,255,255") private String colour; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targettype/MgmtTargetTypeRequestBodyPost.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targettype/MgmtTargetTypeRequestBodyPost.java index 8adc15c720..230b5dec4d 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targettype/MgmtTargetTypeRequestBodyPost.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targettype/MgmtTargetTypeRequestBodyPost.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.targettype; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targettype/MgmtTargetTypeRequestBodyPut.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targettype/MgmtTargetTypeRequestBodyPut.java index 1391166534..dae73e45b6 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targettype/MgmtTargetTypeRequestBodyPut.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/json/model/targettype/MgmtTargetTypeRequestBodyPut.java @@ -1,14 +1,16 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.targettype; import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; /** * Request Body for TargetType PUT. @@ -17,12 +19,15 @@ public class MgmtTargetTypeRequestBodyPut { @JsonProperty(required = true) + @Schema(example = "updatedTypeName") private String name; @JsonProperty + @Schema(example = "an updated description") private String description; @JsonProperty + @Schema(example = "#aaafff") private String colour; /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtActionRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtActionRestApi.java index 9d2a1a75f7..702a25d63c 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtActionRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtActionRestApi.java @@ -1,15 +1,23 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import org.eclipse.hawkbit.mgmt.json.model.PagedList; import org.eclipse.hawkbit.mgmt.json.model.action.MgmtAction; +import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -21,6 +29,7 @@ * REST API providing (read-only) access to actions. */ // no request mapping specified here to avoid CVE-2021-22044 in Feign client +@Tag(name = "Actions", description = "REST API providing (read-only) access to actions.") public interface MgmtActionRestApi { /** @@ -46,6 +55,16 @@ public interface MgmtActionRestApi { * JsonResponseExceptionHandler is handling the response. */ + @Operation(summary = "Return all actions", description = "Handles the GET request of retrieving all actions.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.ACTION_V1_REQUEST_MAPPING, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getActions( @@ -64,6 +83,15 @@ ResponseEntity> getActions( * * @return the {@link MgmtAction} */ + @Operation(summary = "Return action by id", description = "Handles the GET request of retrieving a single action by actionId.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.ACTION_V1_REQUEST_MAPPING + "/{actionId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getAction(@PathVariable("actionId") Long actionId); diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtBasicAuthRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtBasicAuthRestApi.java index a9f921f36d..0336396e9a 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtBasicAuthRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtBasicAuthRestApi.java @@ -1,13 +1,15 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.eclipse.hawkbit.mgmt.json.model.auth.MgmtUserInfo; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; @@ -18,6 +20,7 @@ * Api for handling basic auth user validation */ @SuppressWarnings("squid:S1609") +@Tag(name = "Basic Authentication", description = "API for basic auth user validation.") // no request mapping specified here to avoid CVE-2021-22044 in Feign client public interface MgmtBasicAuthRestApi { /** diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetRestApi.java index a3af5b34ba..1e2f30320a 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetRestApi.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; @@ -12,6 +13,12 @@ import javax.validation.Valid; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import org.eclipse.hawkbit.mgmt.json.model.MgmtMetadata; import org.eclipse.hawkbit.mgmt.json.model.MgmtMetadataBodyPut; import org.eclipse.hawkbit.mgmt.json.model.PagedList; @@ -26,6 +33,7 @@ import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleAssigment; import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget; import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQuery; +import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -40,6 +48,7 @@ * REST Resource handling for DistributionSet CRUD operations. */ // no request mapping specified here to avoid CVE-2021-22044 in Feign client +@Tag(name = "Distribution Sets", description = "REST Resource handling for DistributionSet CRUD operations.") public interface MgmtDistributionSetRestApi { /** @@ -61,6 +70,16 @@ public interface MgmtDistributionSetRestApi { * status OK. The response is always paged. In any failure the * JsonResponseExceptionHandler is handling the response. */ + @Operation(summary = "Return all Distribution Sets", description = "Handles the GET request of retrieving all distribution sets. Required permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getDistributionSets( @@ -78,6 +97,17 @@ ResponseEntity> getDistributionSets( * @return a single DistributionSet with status OK. * */ + @Operation(summary = "Return single Distribution Set", description = "Handles the GET request of retrieving a single distribution set. Required permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getDistributionSet(@PathVariable("distributionSetId") Long distributionSetId); @@ -93,6 +123,18 @@ ResponseEntity> getDistributionSets( * failure the JsonResponseExceptionHandler is handling the * response. */ + @Operation(summary = "Creates new Distribution Sets", description = "Handles the POST request of creating new distribution sets within Hawkbit. The request body must always be a list of sets. Required permission: CREATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -106,6 +148,17 @@ ResponseEntity> getDistributionSets( * @return status OK if delete as successful. * */ + @Operation(summary = "Delete Distribution Set by Id", description = "Handles the DELETE request for a single Distribution Set. Required permission: DELETE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}") ResponseEntity deleteDistributionSet(@PathVariable("distributionSetId") Long distributionSetId); @@ -120,6 +173,19 @@ ResponseEntity> getDistributionSets( * @return status OK if update as successful with updated content. * */ + @Operation(summary = "Update Distribution Set", description = "Handles the UPDATE request for a single Distribution Set. Required permission: UPDATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaType.APPLICATION_JSON_VALUE, MediaTypes.HAL_JSON_VALUE }) @@ -148,6 +214,17 @@ ResponseEntity updateDistributionSet(@PathVariable("distrib * @return status OK if get request is successful with the paged list of * targets */ + @Operation(summary = "Return assigned targets to a specific distribution set", description = "Handles the GET request for retrieving assigned targets of a single distribution set. Required permissions: READ_REPOSITORY and READ_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/assignedTargets", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -179,6 +256,17 @@ ResponseEntity> getAssignedTargets(@PathVariable("distribu * @return status OK if get request is successful with the paged list of * targets */ + @Operation(summary = "Return installed targets to a specific distribution set", description = "Handles the GET request for retrieving installed targets of a single distribution set. Required permissions: READ_REPOSITORY and READ_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/installedTargets", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -210,6 +298,17 @@ ResponseEntity> getInstalledTargets(@PathVariable("distrib * @return status OK if get request is successful with the paged list of * targets */ + @Operation(summary = "Return target filter queries that have the given distribution set as auto assign DS", description = "Handles the GET request for retrieving assigned target filter queries of a single distribution set. Required permissions: READ_REPOSITORY and READ_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/autoAssignTargetFilters", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -236,6 +335,18 @@ ResponseEntity> getAutoAssignTargetFilterQuerie * complex return body which contains information about the assigned * targets and the already assigned targets counters */ + @Operation(summary = "Assigning multiple targets to a single distribution set", description = "Handles the POST request for assigning multiple targets to a distribution set.The request body must always be a list of target IDs. Non-existing targets are silently ignored resulting in a valid response. Required permissions: READ_REPOSITORY and UPDATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/assignedTargets", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, @@ -265,6 +376,17 @@ ResponseEntity createAssignedTarget( * @return status OK if get request is successful with the paged list of * meta data */ + @Operation(summary = "Return meta data for Distribution Set", description = "Get a paged list of meta data for a distribution set. Required permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/metadata", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -284,6 +406,17 @@ ResponseEntity> getMetadata(@PathVariable("distributionS * @return status OK if get request is successful with the value of the meta * data */ + @Operation(summary = "Return single meta data value for a specific key of a Distribution Set", description = "Get a single meta data value for a meta data key. Required permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/metadata/{metadataKey}", produces = { MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getMetadataValue(@PathVariable("distributionSetId") Long distributionSetId, @@ -301,6 +434,19 @@ ResponseEntity getMetadataValue(@PathVariable("distributionSetId") * @return status OK if the update request is successful and the updated * meta data result */ + @Operation(summary = "Update single meta data value of a distribution set", description = "Update a single meta data value for speficic key. Required permission: UPDATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/metadata/{metadataKey}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -316,6 +462,17 @@ ResponseEntity updateMetadata(@PathVariable("distributionSetId") L * the key of the meta data to delete * @return status OK if the delete request is successful */ + @Operation(summary = "Delete a single meta data entry from the distribution set", description = "Delete a single meta data. Required permission: UPDATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/metadata/{metadataKey}") ResponseEntity deleteMetadata(@PathVariable("distributionSetId") Long distributionSetId, @@ -331,6 +488,19 @@ ResponseEntity deleteMetadata(@PathVariable("distributionSetId") Long dist * @return status created if post request is successful with the value of * the created meta data */ + @Operation(summary = "Create a list of meta data for a specific distribution set", description = "Create a list of meta data entries Required permissions: READ_REPOSITORY and UPDATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/metadata", consumes = { MediaType.APPLICATION_JSON_VALUE, MediaTypes.HAL_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, @@ -348,6 +518,19 @@ ResponseEntity> createMetadata(@PathVariable("distributionSet * @return http status * */ + @Operation(summary = "Assign a list of software modules to a distribution set", description = "Handles the POST request for assigning multiple software modules to a distribution set.The request body must always be a list of software module IDs. Required permissions: READ_REPOSITORY and UPDATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/assignedSM", consumes = { MediaType.APPLICATION_JSON_VALUE, MediaTypes.HAL_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, @@ -366,6 +549,17 @@ ResponseEntity assignSoftwareModules(@PathVariable("distributionSetId") Lo * set * @return status OK if rejection was successful. */ + @Operation(summary = "Delete the assignment of the software module from the distribution set", description = "Delete an assignment. Required permission: UPDATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/assignedSM/{softwareModuleId}") ResponseEntity deleteAssignSoftwareModules(@PathVariable("distributionSetId") Long distributionSetId, @@ -389,6 +583,17 @@ ResponseEntity deleteAssignSoftwareModules(@PathVariable("distributionSetI * @return a list of the assigned software modules of a distribution set * with status OK, if none is assigned than {@code null} */ + @Operation(summary = "Return the assigned software modules of a specific distribution set", description = "Handles the GET request of retrieving a single distribution set. Required permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/assignedSM", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -408,6 +613,17 @@ ResponseEntity> getAssignedSoftwareModules( * @return a DistributionSetStatistics with status OK. * */ + @Operation(summary = "Return Rollouts count by status for Distribution Set", description = "Handles the GET request of retrieving Rollouts count by Status for Distribution Set") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/statistics/rollouts", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getRolloutsCountByStatusForDistributionSet(@PathVariable("distributionSetId") Long distributionSetId); @@ -422,6 +638,17 @@ ResponseEntity> getAssignedSoftwareModules( * @return a DistributionSetStatistics with status OK. * */ + @Operation(summary = "Return Actions count by status for Distribution Set", description = "Handles the GET request of retrieving Actions count by Status for Distribution Set") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/statistics/actions", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getActionsCountByStatusForDistributionSet(@PathVariable("distributionSetId") Long distributionSetId); @@ -436,6 +663,17 @@ ResponseEntity> getAssignedSoftwareModules( * @return a DistributionSetStatistics with status OK. * */ + @Operation(summary = "Return Auto Assignments count for Distribution Set", description = "Handles the GET request of retrieving Auto Assignments count for Distribution Set") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/statistics/autoassignments", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getAutoAssignmentsCountForDistributionSet(@PathVariable("distributionSetId") Long distributionSetId); @@ -450,6 +688,17 @@ ResponseEntity> getAssignedSoftwareModules( * @return a DistributionSetStatistics with status OK. * */ + @Operation(summary = "Return Rollouts, Actions and Auto Assignments counts by Status for Distribution Set", description = "Handles the GET request of retrieving Rollouts, Actions and Auto Assignments counts by Status for Distribution Set") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/statistics", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getStatisticsForDistributionSet(@PathVariable("distributionSetId") Long distributionSetId); @@ -463,6 +712,19 @@ ResponseEntity> getAssignedSoftwareModules( * the definition if rollouts and actions should be canceled * @return status OK if the invalidation was successful */ + @Operation(summary = "Invalidate a distribution set", description = "Invalidate a distribution set. Once a distribution set is invalidated, it can not be valid again. An invalidated distribution set cannot be assigned to targets anymore. The distribution set that is going to be invalidated will be removed from all auto assignments. Furthermore, the user can choose to cancel all rollouts and (force) cancel all actions connected to this distribution set. Required permission: UPDATE_REPOSITORY, UPDATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/invalidate", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java index e8fd2842b9..2daf9deff5 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTagRestApi.java @@ -1,21 +1,29 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; import java.util.List; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import org.eclipse.hawkbit.mgmt.json.model.PagedList; import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtDistributionSet; import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtAssignedDistributionSetRequestBody; import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtDistributionSetTagAssigmentResult; import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTag; import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTagRequestBodyPut; +import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -30,6 +38,7 @@ * REST Resource handling for DistributionSetTag CRUD operations. */ // no request mapping specified here to avoid CVE-2021-22044 in Feign client +@Tag(name = "Distribution Set Tags", description = "REST Resource handling for DistributionSetTag CRUD operations.") public interface MgmtDistributionSetTagRestApi { /** @@ -52,6 +61,16 @@ public interface MgmtDistributionSetTagRestApi { * with status OK. The response is always paged. In any failure the * JsonResponseExceptionHandler is handling the response. */ + @Operation(summary = "Return all Distribution Set Tags", description = "Handles the GET request of retrieving all distribution set tags.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getDistributionSetTags( @@ -68,6 +87,17 @@ ResponseEntity> getDistributionSetTags( * * @return a single distribution set tag with status OK. */ + @Operation(summary = "Return single Distribution Set Tag", description = "Handles the GET request of retrieving a single distribution set tag.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Tag not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING + "/{distributionsetTagId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getDistributionSetTag(@PathVariable("distributionsetTagId") Long distributionsetTagId); @@ -82,6 +112,18 @@ ResponseEntity> getDistributionSetTags( * with status code 201 - Created. The Response Body contains the * created distribution set tags but without details. */ + @Operation(summary = "Creates new Distribution Set Tags", description = "Handles the POST request of creating new distribution set tag. The request body must always be a list of distribution set tags.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -98,6 +140,19 @@ ResponseEntity> getDistributionSetTags( * @return status OK if update is successful and the updated distribution * set tag. */ + @Operation(summary = "Update Distribution Set Tag", description = "Handles the PUT request of updating a distribution set tag.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Tag not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING + "/{distributionsetTagId}", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, @@ -113,6 +168,19 @@ ResponseEntity updateDistributionSetTag(@PathVariable("distributionsetT * @return status OK if delete as successfully. * */ + @Operation(summary = "Delete a single distribution set tag", description = "Handles the DELETE request of deleting a single distribution set tag.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Tag not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING + "/{distributionsetTagId}") ResponseEntity deleteDistributionSetTag(@PathVariable("distributionsetTagId") Long distributionsetTagId); @@ -137,6 +205,17 @@ ResponseEntity updateDistributionSetTag(@PathVariable("distributionsetT * * @return the list of assigned distribution sets. */ + @Operation(summary = "Return all assigned distribution sets by given tag Id", description = "Handles the GET request of retrieving a list of assigned distributions.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Tag not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING + MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -159,6 +238,18 @@ ResponseEntity> getAssignedDistributionSets( * @return the list of assigned distribution sets and unassigned * distribution sets. */ + @Operation(summary = "Toggle the assignment of distribution sets by the given tag id", description = "Handles the POST request of toggle distribution assignment. The request body must always be a list of distribution set ids.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING + MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING + "/toggleTagAssignment") ResponseEntity toggleTagAssignment( @@ -175,6 +266,18 @@ ResponseEntity toggleTagAssignment( * * @return the list of assigned distribution set. */ + @Operation(summary = "Assign distribution sets to the given tag id", description = "Handles the POST request of distribution assignment. Already assigned distribution will be ignored.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING + MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { @@ -193,6 +296,17 @@ ResponseEntity> assignDistributionSets( * the ID of the distribution set to unassign * @return http status code */ + @Operation(summary = "Unassign one distribution set from the given tag id", description = "Handles the DELETE request of unassign the given distribution.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Tag not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING + MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING + "/{distributionsetId}") ResponseEntity unassignDistributionSet(@PathVariable("distributionsetTagId") Long distributionsetTagId, diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTypeRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTypeRestApi.java index 0549a41487..60e78671e4 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTypeRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDistributionSetTypeRestApi.java @@ -1,21 +1,29 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; import java.util.List; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import org.eclipse.hawkbit.mgmt.json.model.MgmtId; import org.eclipse.hawkbit.mgmt.json.model.PagedList; import org.eclipse.hawkbit.mgmt.json.model.distributionsettype.MgmtDistributionSetType; import org.eclipse.hawkbit.mgmt.json.model.distributionsettype.MgmtDistributionSetTypeRequestBodyPost; import org.eclipse.hawkbit.mgmt.json.model.distributionsettype.MgmtDistributionSetTypeRequestBodyPut; import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleType; +import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -27,9 +35,10 @@ import org.springframework.web.bind.annotation.RequestParam; /** - * REST Resource handling for DistributionSet CRUD operations. + * REST Resource handling for DistributionSetType CRUD operations. */ // no request mapping specified here to avoid CVE-2021-22044 in Feign client +@Tag(name = "Distribution Set Types", description = "REST Resource handling for DistributionSetType CRUD operations.") public interface MgmtDistributionSetTypeRestApi { /** @@ -53,6 +62,16 @@ public interface MgmtDistributionSetTypeRestApi { * failure the JsonResponseExceptionHandler is handling the * response. */ + @Operation(summary = "Return all Distribution Set Types", description = "Handles the GET request of retrieving all distribution set types. Required Permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getDistributionSetTypes( @@ -70,6 +89,17 @@ ResponseEntity> getDistributionSetTypes( * * @return a single DS type with status OK. */ + @Operation(summary = "Return single Distribution Set Type", description = "Handles the GET request of retrieving a single distribution set type. Required Permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getDistributionSetType( @@ -83,6 +113,17 @@ ResponseEntity getDistributionSetType( * @return status OK if delete is successful. * */ + @Operation(summary = "Delete Distribution Set Type by Id", description = "Handles the DELETE request for a single distribution set type. Required Permission: DELETE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}") ResponseEntity deleteDistributionSetType(@PathVariable("distributionSetTypeId") Long distributionSetTypeId); @@ -95,6 +136,19 @@ ResponseEntity getDistributionSetType( * the DS type to be updated. * @return status OK if update is successful */ + @Operation(summary = "Update Distribution Set Type", description = "Handles the PUT request for a single distribution set type. Required Permission: UPDATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, @@ -114,6 +168,18 @@ ResponseEntity updateDistributionSetType( * failure the JsonResponseExceptionHandler is handling the * response. */ + @Operation(summary = "Create new distribution set types", description = "Handles the POST request for creating new distribution set types. The request body must always be a list of types. Required Permission: CREATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -128,6 +194,17 @@ ResponseEntity> createDistributionSetTypes( * of the DistributionSetType. * @return Unpaged list of module types and OK in case of success. */ + @Operation(summary = "Return mandatory Software Module Types in a Distribution Set Type", description = "Handles the GET request of retrieving the list of mandatory software module types in that distribution set type. Required Permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}/" + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_MANDATORY_MODULE_TYPES, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -144,6 +221,17 @@ ResponseEntity> getMandatoryModules( * of SoftwareModuleType. * @return Unpaged list of module types and OK in case of success. */ + @Operation(summary = "Return single mandatory Software Module Type in a Distribution Set Type", description = "Handles the GET request of retrieving the single mandatory software module type in that distribution set type. Required Permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}/" + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_MANDATORY_MODULE_TYPES + "/{softwareModuleTypeId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -161,6 +249,17 @@ ResponseEntity getMandatoryModule( * of SoftwareModuleType. * @return Unpaged list of module types and OK in case of success. */ + @Operation(summary = "Return single optional Software Module Type in a Distribution Set Type", description = "Handles the GET request of retrieving the single optional software module type in that distribution set type. Required Permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}/" + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_OPTIONAL_MODULE_TYPES + "/{softwareModuleTypeId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -176,6 +275,17 @@ ResponseEntity getOptionalModule( * of the DistributionSetType. * @return Unpaged list of module types and OK in case of success. */ + @Operation(summary = "Return optional Software Module Types in a Distribution Set Type", description = "Handles the GET request of retrieving the list of optional software module types in that distribution set type. Required Permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}/" + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_OPTIONAL_MODULE_TYPES, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -193,6 +303,17 @@ ResponseEntity> getOptionalModules( * * @return OK if the request was successful */ + @Operation(summary = "Delete a mandatory module from a Distribution Set Type", description = "Handles the DELETE request for removing a software module type from a single distribution set type. Required Permission: DELETE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}/" + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_MANDATORY_MODULE_TYPES + "/{softwareModuleTypeId}") ResponseEntity removeMandatoryModule(@PathVariable("distributionSetTypeId") Long distributionSetTypeId, @@ -209,6 +330,17 @@ ResponseEntity removeMandatoryModule(@PathVariable("distributionSetTypeId" * * @return OK if the request was successful */ + @Operation(summary = "Delete an optional module from a Distribution Set Type", description = "Handles DELETE request for removing an optional module from the distribution set type. Note that a DS type cannot be changed after it has been used by a DS. Required Permission: UPDATE_REPOSITORY and READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}/" + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_OPTIONAL_MODULE_TYPES + "/{softwareModuleTypeId}") ResponseEntity removeOptionalModule(@PathVariable("distributionSetTypeId") Long distributionSetTypeId, @@ -225,6 +357,19 @@ ResponseEntity removeOptionalModule(@PathVariable("distributionSetTypeId") * * @return OK if the request was successful */ + @Operation(summary = "Add mandatory Software Module Type to a Distribution Set Type", description = "Handles the POST request for adding a mandatory software module type to a distribution set type.Note that a DS type cannot be changed after it has been used by a DS. Required Permission: UPDATE_REPOSITORY and READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}/" + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_MANDATORY_MODULE_TYPES, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -242,6 +387,19 @@ ResponseEntity addMandatoryModule(@PathVariable("distributionSetTypeId") L * * @return OK if the request was successful */ + @Operation(summary = "Add optional Software Module Type to a Distribution Set Type", description = "Handles the POST request for adding an optional software module type to a distribution set type.Note that a DS type cannot be changed after it has been used by a DS. Required Permission: UPDATE_REPOSITORY and READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution Set Type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}/" + MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_OPTIONAL_MODULE_TYPES, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDownloadArtifactRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDownloadArtifactRestApi.java index 19682e2ed1..3a2692a43a 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDownloadArtifactRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDownloadArtifactRestApi.java @@ -1,15 +1,17 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; import java.io.InputStream; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -19,6 +21,7 @@ * API to download artifacts */ @FunctionalInterface +@Tag(name = "Download artifact", description = "API to download artifacts.") // no request mapping specified here to avoid CVE-2021-22044 in Feign client public interface MgmtDownloadArtifactRestApi { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDownloadRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDownloadRestApi.java index b994b77504..0709d50cdc 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDownloadRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtDownloadRestApi.java @@ -1,15 +1,17 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; import java.io.InputStream; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -20,6 +22,7 @@ * A resource for download artifacts. */ @FunctionalInterface +@Tag(name = "Download artifact by ID", description = "API to download artifacts by download Id.") // no request mapping specified here to avoid CVE-2021-22044 in Feign client public interface MgmtDownloadRestApi { diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRepresentationMode.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRepresentationMode.java index c53a72e5d4..9deb6d3c66 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRepresentationMode.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRepresentationMode.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRestConstants.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRestConstants.java index ce47dd6134..f64ccfbec4 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRestConstants.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRestConstants.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRolloutRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRolloutRestApi.java index 69a90fc721..a3827ea019 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRolloutRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtRolloutRestApi.java @@ -1,18 +1,26 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import org.eclipse.hawkbit.mgmt.json.model.PagedList; import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutResponseBody; import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutRestRequestBody; import org.eclipse.hawkbit.mgmt.json.model.rolloutgroup.MgmtRolloutGroupResponseBody; import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget; +import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -26,6 +34,7 @@ * REST Resource handling rollout CRUD operations. */ // no request mapping specified here to avoid CVE-2021-22044 in Feign client +@Tag(name = "Rollouts", description = "REST API for Rollout CRUD operations.") public interface MgmtRolloutRestApi { /** @@ -50,6 +59,16 @@ public interface MgmtRolloutRestApi { * status OK. The response is always paged. In any failure the * JsonResponseExceptionHandler is handling the response. */ + @Operation(summary = "Return all Rollouts", description = "Handles the GET request of retrieving all rollouts. Required Permission: READ_ROLLOUT") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getRollouts( @@ -66,6 +85,17 @@ ResponseEntity> getRollouts( * the ID of the rollout to retrieve * @return a single rollout with status OK. */ + @Operation(summary = "Return single Rollout", description = "Handles the GET request of retrieving a single rollout. Required Permission: READ_ROLLOUT") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Rollout not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getRollout(@PathVariable("rolloutId") Long rolloutId); @@ -80,6 +110,18 @@ ResponseEntity> getRollouts( * failure the JsonResponseExceptionHandler is handling the * response. */ + @Operation(summary = "Create a new Rollout", description = "Handles the POST request of creating new rollout. Required Permission: CREATE_ROLLOUT") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -95,6 +137,16 @@ ResponseEntity> getRollouts( * @return OK response (200) if rollout is approved now. In case of any * exception the corresponding errors occur. */ + @Operation(summary = "Approve a Rollout", description = "Handles the POST request of approving a created rollout. Only possible if approval workflow is enabled in system configuration and rollout is in state WAITING_FOR_APPROVAL. Required Permission: APPROVE_ROLLOUT") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/approve", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity approve(@PathVariable("rolloutId") Long rolloutId, @@ -110,6 +162,16 @@ ResponseEntity approve(@PathVariable("rolloutId") Long rolloutId, * @return OK response (200) if rollout is denied now. In case of any * exception the corresponding errors occur. */ + @Operation(summary = "Deny a Rollout", description = "Handles the POST request of denying a created rollout. Only possible if approval workflow is enabled in system configuration and rollout is in state WAITING_FOR_APPROVAL. Required Permission: APPROVE_ROLLOUT") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/deny", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity deny(@PathVariable("rolloutId") Long rolloutId, @@ -123,6 +185,16 @@ ResponseEntity deny(@PathVariable("rolloutId") Long rolloutId, * @return OK response (200) if rollout could be started. In case of any * exception the corresponding errors occur. */ + @Operation(summary = "Start a Rollout", description = "Handles the POST request of starting a created rollout. Required Permission: HANDLE_ROLLOUT") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/start", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity start(@PathVariable("rolloutId") Long rolloutId); @@ -135,6 +207,16 @@ ResponseEntity deny(@PathVariable("rolloutId") Long rolloutId, * @return OK response (200) if rollout could be paused. In case of any * exception the corresponding errors occur. */ + @Operation(summary = "Pause a Rollout", description = "Handles the POST request of pausing a running rollout. Required Permission: HANDLE_ROLLOUT") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/pause", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity pause(@PathVariable("rolloutId") Long rolloutId); @@ -147,6 +229,17 @@ ResponseEntity deny(@PathVariable("rolloutId") Long rolloutId, * @return OK response (200) if rollout could be deleted. In case of any * exception the corresponding errors occur. */ + @Operation(summary = "Delete a Rollout", description = "Handles the DELETE request of deleting a rollout. Required Permission: DELETE_ROLLOUT") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Rollout not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity delete(@PathVariable("rolloutId") Long rolloutId); @@ -159,6 +252,16 @@ ResponseEntity deny(@PathVariable("rolloutId") Long rolloutId, * @return OK response (200) if rollout could be resumed. In case of any * exception the corresponding errors occur. */ + @Operation(summary = "Resume a Rollout", description = "Handles the POST request of resuming a paused rollout. Required Permission: HANDLE_ROLLOUT") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/resume", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity resume(@PathVariable("rolloutId") Long rolloutId); @@ -183,12 +286,23 @@ ResponseEntity deny(@PathVariable("rolloutId") Long rolloutId, * @param representationModeParam * the representation mode parameter specifying whether a compact * or a full representation shall be returned - * + * * @return a list of all rollout groups referred to a rollout for a defined * or default page request with status OK. The response is always * paged. In any failure the JsonResponseExceptionHandler is * handling the response. */ + @Operation(summary = "Return all rollout groups referred to a Rollout", description = "Handles the GET request of retrieving all deploy groups of a specific rollout. Required Permission: READ_ROLLOUT") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Rollout not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/deploygroups", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getRolloutGroups(@PathVariable("rolloutId") Long rolloutId, @@ -207,6 +321,17 @@ ResponseEntity> getRolloutGroups(@PathVa * the groupId to retrieve the rollout group * @return the OK response containing the MgmtRolloutGroupResponseBody */ + @Operation(summary = "Return single rollout group", description = "Handles the GET request of a single deploy group of a specific rollout. Required Permission: READ_ROLLOUT") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Rollout not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/deploygroups/{groupId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -236,6 +361,17 @@ ResponseEntity getRolloutGroup(@PathVariable("roll * @return a paged list of targets related to a specific rollout and rollout * group. */ + @Operation(summary = "Return all targets related to a specific rollout group", description = "Handles the GET request of retrieving all targets of a single deploy group of a specific rollout. Required Permissions: READ_ROLLOUT, READ_TARGET.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Rollout not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/deploygroups/{groupId}/targets", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -255,7 +391,41 @@ ResponseEntity> getRolloutGroupTargets(@PathVariable("roll * @return OK response (200). In case of any exception the corresponding * errors occur. */ + @Operation(summary = "Force trigger processing next group of a Rollout", description = "Handles the POST request of triggering the next group of a rollout. Required Permission: UPDATE_ROLLOUT") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/triggerNextGroup", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity triggerNextGroup(@PathVariable("rolloutId") Long rolloutId); + + /** + * Handles the POST request to retry a rollout + * + * @param rolloutId + * the ID of the rollout to be retried. + * @return OK response (200). In case of any exception the corresponding + * errors occur. + */ + @Operation(summary = "Retry a rollout", description = "Handles the POST request of retrying a rollout. Required Permission: CREATE_ROLLOUT") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Rollout not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) + @PostMapping(value = MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/retry", produces = { + MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE}) + ResponseEntity retryRollout(@PathVariable("rolloutId") final Long rolloutId); + } diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtSoftwareModuleRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtSoftwareModuleRestApi.java index ebf8c3caf1..1c3c113232 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtSoftwareModuleRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtSoftwareModuleRestApi.java @@ -1,15 +1,22 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; import java.util.List; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import org.eclipse.hawkbit.mgmt.json.model.PagedList; import org.eclipse.hawkbit.mgmt.json.model.artifact.MgmtArtifact; import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModule; @@ -17,6 +24,7 @@ import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleMetadataBodyPut; import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleRequestBodyPost; import org.eclipse.hawkbit.mgmt.json.model.softwaremodule.MgmtSoftwareModuleRequestBodyPut; +import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -35,6 +43,7 @@ * operations. */ // no request mapping specified here to avoid CVE-2021-22044 in Feign client +@Tag(name = "Software Modules", description = "REST API for SoftwareModule and related Artifact CRUD operations.") public interface MgmtSoftwareModuleRestApi { /** @@ -58,6 +67,18 @@ public interface MgmtSoftwareModuleRestApi { * failure the JsonResponseExceptionHandler is handling the * response. */ + @Operation(summary = "Upload artifact", description = "Handles POST request for artifact upload. Required Permission: CREATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/artifacts", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -79,10 +100,20 @@ ResponseEntity uploadArtifact(@PathVariable("softwareModuleId") fi * with status OK. The response is always paged. In any failure the * JsonResponseExceptionHandler is handling the response. */ + @Operation(summary = "Return all meta data of artifacts assigned to a software module", description = "Handles the GET request of retrieving all meta data of artifacts assigned to a software module. Required Permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module not found ", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/artifacts", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) - ResponseEntity> getArtifacts(@PathVariable("softwareModuleId") final Long softwareModuleId, @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_REPRESENTATION_MODE, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_REPRESENTATION_MODE_DEFAULT) String representationModeParam, @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_USE_ARTIFACT_URL_HANDLER, required = false) final Boolean useArtifactUrlHandler); @@ -98,10 +129,20 @@ ResponseEntity> getArtifacts(@PathVariable("softwareModuleId" * * @return responseEntity with status ok if successful */ + @Operation(summary = "Return single Artifact meta data", description = "Handles the GET request of retrieving a single Artifact meta data request. Required Permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/artifacts/{artifactId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) - @ResponseBody ResponseEntity getArtifact( @PathVariable("softwareModuleId") final Long softwareModuleId, @PathVariable("artifactId") final Long artifactId, @@ -117,6 +158,17 @@ ResponseEntity> getArtifacts(@PathVariable("softwareModuleId" * * @return status OK if delete as successful. */ + @Operation(summary = "Delete artifact by Id", description = "Handles the DELETE request for a single Artifact assigned to a SoftwareModule. Required Permission: DELETE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/artifacts/{artifactId}") @ResponseBody @@ -143,6 +195,16 @@ ResponseEntity deleteArtifact(@PathVariable("softwareModuleId") final Long * status OK. The response is always paged. In any failure the * JsonResponseExceptionHandler is handling the response. */ + @Operation(summary = "Return all Software modules", description = "Handles the GET request of retrieving all softwaremodules. Required Permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getSoftwareModules( @@ -159,6 +221,17 @@ ResponseEntity> getSoftwareModules( * * @return a single softwareModule with status OK. */ + @Operation(summary = "Return Software Module by id", description = "Handles the GET request of retrieving a single softwaremodule. Required Permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module not found ", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getSoftwareModule(@PathVariable("softwareModuleId") final Long softwareModuleId); @@ -174,6 +247,17 @@ ResponseEntity> getSoftwareModules( * failure the JsonResponseExceptionHandler is handling the * response. */ + @Operation(summary = "Create Software Module(s)", description = "Handles the POST request of creating new software modules. The request body must always be a list of modules. Required Permission: CREATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -189,6 +273,19 @@ ResponseEntity> createSoftwareModules( * the modules to be updated. * @return status OK if update was successful */ + @Operation(summary = "Update Software Module", description = "Handles the PUT request for a single softwaremodule within Hawkbit. Required Permission: UPDATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -204,6 +301,17 @@ ResponseEntity updateSoftwareModule( * @return status OK if delete was successful. * */ + @Operation(summary = "Delete Software Module by Id", description = "Handles the DELETE request for a single softwaremodule within Hawkbit. Required Permission: DELETE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}") ResponseEntity deleteSoftwareModule(@PathVariable("softwareModuleId") final Long softwareModuleId); @@ -227,6 +335,17 @@ ResponseEntity updateSoftwareModule( * @return status OK if get request is successful with the paged list of * meta data */ + @Operation(summary = "Return meta data for a Software Module", description = "Get a paged list of meta data for a software module. Required Permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module not found ", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/metadata", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -247,6 +366,17 @@ ResponseEntity> getMetadata( * @return status OK if get request is successful with the value of the meta * data */ + @Operation(summary = "Return single meta data value for a specific key of a Software Module", description = "Get a single meta data value for a meta data key. Required Permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module not found ", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/metadata/{metadataKey}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -266,6 +396,17 @@ ResponseEntity getMetadataValue( * @return status OK if the update request is successful and the updated * meta data result */ + @Operation(summary = "Update a single meta data value of a Software Module", description = "Update a single meta data value for speficic key. Required Permission: UPDATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/metadata/{metadataKey}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -282,6 +423,17 @@ ResponseEntity updateMetadata( * the key of the meta data to delete * @return status OK if the delete request is successful */ + @Operation(summary = "Delete single meta data entry from the software module", description = "Delete a single meta data. Required Permission: UPDATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/metadata/{metadataKey}") ResponseEntity deleteMetadata(@PathVariable("softwareModuleId") final Long softwareModuleId, @@ -297,6 +449,19 @@ ResponseEntity deleteMetadata(@PathVariable("softwareModuleId") final Long * @return status created if post request is successful with the value of * the created meta data */ + @Operation(summary = "Creates a list of meta data for a specific Software Module", description = "Create a list of meta data entries Required Permission: UPDATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/metadata", consumes = { MediaType.APPLICATION_JSON_VALUE, MediaTypes.HAL_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtSoftwareModuleTypeRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtSoftwareModuleTypeRestApi.java index efb8492e82..3b62df89ef 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtSoftwareModuleTypeRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtSoftwareModuleTypeRestApi.java @@ -1,19 +1,27 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; import java.util.List; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import org.eclipse.hawkbit.mgmt.json.model.PagedList; import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleType; import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleTypeRequestBodyPost; import org.eclipse.hawkbit.mgmt.json.model.softwaremoduletype.MgmtSoftwareModuleTypeRequestBodyPut; +import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -29,6 +37,7 @@ * operations. */ // no request mapping specified here to avoid CVE-2021-22044 in Feign client +@Tag(name = "Software Module Types", description = "REST API for SoftwareModuleTypes CRUD operations.") public interface MgmtSoftwareModuleTypeRestApi { /** @@ -51,6 +60,16 @@ public interface MgmtSoftwareModuleTypeRestApi { * with status OK. The response is always paged. In any failure the * JsonResponseExceptionHandler is handling the response. */ + @Operation(summary = "Return all Software Module Types", description = "Handles the GET request of retrieving all software module types. Required Permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.SOFTWAREMODULETYPE_V1_REQUEST_MAPPING, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getTypes( @@ -67,6 +86,17 @@ ResponseEntity> getTypes( * * @return a single softwareModule with status OK. */ + @Operation(summary = "Return single Software Module Type", description = "Handles the GET request of retrieving a single software module type. Required Permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module Type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.SOFTWAREMODULETYPE_V1_REQUEST_MAPPING + "/{softwareModuleTypeId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getSoftwareModuleType( @@ -80,6 +110,17 @@ ResponseEntity getSoftwareModuleType( * @return status OK if delete as successfully. * */ + @Operation(summary = "Delete Software Module Type by Id", description = "Handles the DELETE request for a single software module type. Required Permission: DELETE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module Type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.SOFTWAREMODULETYPE_V1_REQUEST_MAPPING + "/{softwareModuleTypeId}") ResponseEntity deleteSoftwareModuleType(@PathVariable("softwareModuleTypeId") Long softwareModuleTypeId); @@ -92,6 +133,19 @@ ResponseEntity getSoftwareModuleType( * the module type to be updated. * @return status OK if update is successful */ + @Operation(summary = "Update Software Module Type", description = "Handles the PUT request for a single software module type. Required Permission: UPDATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module Type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = MgmtRestConstants.SOFTWAREMODULETYPE_V1_REQUEST_MAPPING + "/{softwareModuleTypeId}", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, @@ -111,6 +165,19 @@ ResponseEntity updateSoftwareModuleType( * failure the JsonResponseExceptionHandler is handling the * response. */ + @Operation(summary = "Creates new Software Module Types", description = "Handles the POST request of creating new software module types. The request body must always be a list of module types. Required Permission: CREATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Software Module not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.SOFTWAREMODULETYPE_V1_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtSystemManagementRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtSystemManagementRestApi.java index 735e5f7c56..3307d6898a 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtSystemManagementRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtSystemManagementRestApi.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetFilterQueryRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetFilterQueryRestApi.java index e35ddf693c..df2092bb2b 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetFilterQueryRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetFilterQueryRestApi.java @@ -1,20 +1,26 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; -import java.util.List; - +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import org.eclipse.hawkbit.mgmt.json.model.PagedList; import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtDistributionSet; import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtDistributionSetAutoAssignment; import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQuery; import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQueryRequestBody; +import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -26,10 +32,13 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * Api for handling target operations. */ // no request mapping specified here to avoid CVE-2021-22044 in Feign client +@Tag(name = "Target Filter Queries", description = "REST API for Target Filter Queries CRUD operations.") public interface MgmtTargetFilterQueryRestApi { /** @@ -40,6 +49,17 @@ public interface MgmtTargetFilterQueryRestApi { * @return a single target with status OK. */ + @Operation(summary = "Return target filter query by id", description = "Handles the GET request of retrieving a single target filter query. Required permission: READ_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target filter query not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{filterId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getFilter(@PathVariable("filterId") Long filterId); @@ -63,14 +83,24 @@ public interface MgmtTargetFilterQueryRestApi { * status OK. The response is always paged. In any failure the * JsonResponseExceptionHandler is handling the response. */ - + @Operation(summary = "Return all target filter queries", description = "Handles the GET request of retrieving all target filter queries. Required permission: READ_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getFilters( @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) int pagingOffsetParam, @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) int pagingLimitParam, @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam); + @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) String rsqlParam, + @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_REPRESENTATION_MODE, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_REPRESENTATION_MODE_DEFAULT) String representationModeParam); /** * Handles the POST request of creating new target filters. The request body @@ -83,6 +113,18 @@ ResponseEntity> getFilters( * is returned. In any failure the JsonResponseExceptionHandler is * handling the response. */ + @Operation(summary = "Create target filter", description = "Handles the POST request to create a new target filter query. Required permission: CREATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -102,6 +144,19 @@ ResponseEntity> getFilters( * @return the updated target filter response which contains all fields * including fields which have not been updated */ + @Operation(summary = "Updates target filter query by id", description = "Handles the PUT request of updating a target filter query. Required permission: UPDATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target filter query not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{filterId}", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -117,6 +172,17 @@ ResponseEntity updateFilter(@PathVariable("filterId") Lon * OK. In any failure the JsonResponseExceptionHandler is handling * the response. */ + @Operation(summary = "Delete target filter by id", description = "Handles the DELETE request of deleting a target filter query. Required permission: DELETE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target filter query not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{filterId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity deleteFilter(@PathVariable("filterId") Long filterId); @@ -142,6 +208,16 @@ ResponseEntity updateFilter(@PathVariable("filterId") Lon * @return the assigned distribution set with status OK, if none is assigned * than {@code null} content (e.g. "{}") */ + @Operation(summary = "Return distribution set for auto assignment of a specific target filter", description = "Handles the GET request of retrieving the auto assign distribution set. Required permission: READ_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{filterId}/autoAssignDS", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getAssignedDistributionSet(@PathVariable("filterId") Long filterId); @@ -157,6 +233,19 @@ ResponseEntity updateFilter(@PathVariable("filterId") Lon * assignment * @return http status */ + @Operation(summary = "Set auto assignment of distribution set for a target filter query", description = "Handles the POST request of setting the auto assign distribution set for a target filter query. Required permissions: UPDATE_TARGET and READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target filter not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{filterId}/autoAssignDS", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -171,6 +260,17 @@ ResponseEntity postAssignedDistributionSet(@PathVariable( * of the target to change * @return http status */ + @Operation(summary = "Remove Distribution Set for auto assignment of a target filter", description = "Removes the auto assign distribution set from the target filter query. Required permission: UPDATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target filter query not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{filterId}/autoAssignDS") ResponseEntity deleteAssignedDistributionSet(@PathVariable("filterId") Long filterId); diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetRestApi.java index f74c870cdd..ac3e32e400 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetRestApi.java @@ -1,15 +1,22 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; import java.util.List; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import org.eclipse.hawkbit.mgmt.json.model.MgmtId; import org.eclipse.hawkbit.mgmt.json.model.MgmtMetadata; import org.eclipse.hawkbit.mgmt.json.model.MgmtMetadataBodyPut; @@ -25,6 +32,7 @@ import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTargetAutoConfirm; import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTargetAutoConfirmUpdate; import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTargetRequestBody; +import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -40,6 +48,7 @@ * API for handling target operations. */ // no request mapping specified here to avoid CVE-2021-22044 in Feign client +@Tag(name = "Targets", description = "REST API for Target CRUD operations.") public interface MgmtTargetRestApi { /** @@ -49,6 +58,17 @@ public interface MgmtTargetRestApi { * the ID of the target to retrieve * @return a single target with status OK. */ + @Operation(summary = "Return target by id", description = "Handles the GET request of retrieving a single target. Required Permission: READ_TARGET.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getTarget(@PathVariable("targetId") String targetId); @@ -72,7 +92,16 @@ public interface MgmtTargetRestApi { * status OK. The response is always paged. In any failure the * JsonResponseExceptionHandler is handling the response. */ - + @Operation(summary = "Return all targets", description = "Handles the GET request of retrieving all targets. Required permission: READ_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getTargets( @@ -92,6 +121,18 @@ ResponseEntity> getTargets( * entities. In any failure the JsonResponseExceptionHandler is * handling the response. */ + @Operation(summary = "Create target(s)", description = "Handles the POST request of creating new targets. The request body must always be a list of targets. Required Permission: CREATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -111,6 +152,19 @@ ResponseEntity> getTargets( * @return the updated target response which contains all fields also fields * which have not updated */ + @Operation(summary = "Update target by id", description = "Handles the PUT request of updating a target. Required Permission: UPDATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -126,6 +180,17 @@ ResponseEntity updateTarget(@PathVariable("targetId") String targetI * In any failure the JsonResponseExceptionHandler is handling the * response. */ + @Operation(summary = "Delete target by id", description = "Handles the DELETE request of deleting a single target. Required Permission: DELETE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}") ResponseEntity deleteTarget(@PathVariable("targetId") String targetId); @@ -138,6 +203,15 @@ ResponseEntity updateTarget(@PathVariable("targetId") String targetI * In any failure the JsonResponseExceptionHandler is handling the * response. */ + @Operation(summary = "Unassign target type from target.", description = "Remove the target type from a target. The target type will be set to null. Required permission: UPDATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + MgmtRestConstants.TARGET_TARGET_TYPE_V1_REQUEST_MAPPING) ResponseEntity unassignTargetType(@PathVariable("targetId") String targetId); @@ -151,6 +225,15 @@ ResponseEntity updateTarget(@PathVariable("targetId") String targetI * In any failure the JsonResponseExceptionHandler is handling the * response. */ + @Operation(summary = "Assign target type to a target", description = "Assign or update the target type of a target. Required permission: UPDATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + MgmtRestConstants.TARGET_TARGET_TYPE_V1_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -164,6 +247,17 @@ ResponseEntity updateTarget(@PathVariable("targetId") String targetI * the ID of the target to retrieve the attributes. * @return the target attributes as map response with status OK */ + @Operation(summary = "Return attributes of a specific target", description = "Handles the GET request of retrieving the attributes of a specific target. Reponse is a key/value list. Required Permission: READ_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/attributes", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getAttributes(@PathVariable("targetId") String targetId); @@ -189,6 +283,17 @@ ResponseEntity updateTarget(@PathVariable("targetId") String targetI * status OK. The response is always paged. In any failure the * JsonResponseExceptionHandler is handling the response. */ + @Operation(summary = "Return actions for a specific target", description = "Handles the GET request of retrieving the full action history of a specific target. Required Permission: READ_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/actions", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getActionHistory(@PathVariable("targetId") String targetId, @@ -207,6 +312,17 @@ ResponseEntity> getActionHistory(@PathVariable("targetId") * to load * @return the action */ + @Operation(summary = "Return action by id of a specific target", description = "Handles the GET request of retrieving a specific action on a specific target. Required Permission: READ_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/actions/{actionId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getAction(@PathVariable("targetId") String targetId, @@ -224,6 +340,17 @@ ResponseEntity getAction(@PathVariable("targetId") String targetId, * optional parameter, which indicates a force cancel * @return status no content in case cancellation was successful */ + @Operation(summary = "Cancel action for a specific target", description = "Cancels an active action, only active actions can be deleted. Required Permission: UPDATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/actions/{actionId}") ResponseEntity cancelAction(@PathVariable("targetId") String targetId, @PathVariable("actionId") Long actionId, @@ -240,6 +367,19 @@ ResponseEntity cancelAction(@PathVariable("targetId") String targetId, * to update the action * @return status no content in case cancellation was successful */ + @Operation(summary = "Switch an action from soft to forced", description = "Handles the PUT request to switch an action from soft to forced. Required Permission: UPDATE_TARGET.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/actions/{actionId}", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -267,6 +407,17 @@ ResponseEntity updateAction(@PathVariable("targetId") String targetI * with status OK. The response is always paged. In any failure the * JsonResponseExceptionHandler is handling the response. */ + @Operation(summary = "Return status of a specific action on a specific target", description = "Handles the GET request of retrieving a specific action on a specific target. Required Permission: READ_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/actions/{actionId}/status", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -277,7 +428,7 @@ ResponseEntity> getActionStatusList(@PathVariable("t @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) String sortParam); /** - * Handles the GET request of retrieving the assigned distribution set of an + * Handles the GET request of retrieving the assigned distribution set of a * specific target. * * @param targetId @@ -286,6 +437,17 @@ ResponseEntity> getActionStatusList(@PathVariable("t * @return the assigned distribution set with status OK, if none is assigned * than {@code null} content (e.g. "{}") */ + @Operation(summary = "Return the assigned distribution set of a specific target", description = "Handles the GET request of retrieving the assigned distribution set of an specific target. Required Permission: READ_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/assignedDS", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getAssignedDistributionSet(@PathVariable("targetId") String targetId); @@ -305,6 +467,19 @@ ResponseEntity> getActionStatusList(@PathVariable("t * complex return body which contains information about the assigned * targets and the already assigned targets counters */ + @Operation(summary = "Assigns a distribution set to a specific target", description = "Handles the POST request for assigning a distribution set to a specific target. Required Permission: READ_REPOSITORY and UPDATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/assignedDS", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -314,13 +489,24 @@ ResponseEntity postAssignedDistributionSet( /** * Handles the GET request of retrieving the installed distribution set of - * an specific target. + * a specific target. * * @param targetId * the ID of the target to retrieve * @return the assigned installed set with status OK, if none is installed * than {@code null} content (e.g. "{}") */ + @Operation(summary = "Return installed distribution set of a specific target", description = "Handles the GET request of retrieving the installed distribution set of an specific target. Required Permission: READ_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/installedDS", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getInstalledDistributionSet(@PathVariable("targetId") String targetId); @@ -345,6 +531,17 @@ ResponseEntity postAssignedDistributionSet( * @return status OK if get request is successful with the paged list of * meta data */ + @Operation(summary = "Return metadata for specific target", description = "Get a paged list of meta data for a target. Required permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/metadata", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getMetadata(@PathVariable("targetId") String targetId, @@ -363,6 +560,17 @@ ResponseEntity> getMetadata(@PathVariable("targetId") St * @return status OK if get request is successful with the value of the meta * data */ + @Operation(summary = "Return single metadata value for a specific key of a target", description = "Get a single meta data value for a meta data key. Required permission: READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/metadata/{metadataKey}", produces = { MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getMetadataValue(@PathVariable("targetId") String targetId, @@ -380,6 +588,19 @@ ResponseEntity getMetadataValue(@PathVariable("targetId") String t * @return status OK if the update request is successful and the updated * meta data result */ + @Operation(summary = "Updates a single meta data value of a target", description = "Update a single meta data value for speficic key. Required permission: UPDATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/metadata/{metadataKey}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity updateMetadata(@PathVariable("targetId") String targetId, @@ -394,6 +615,17 @@ ResponseEntity updateMetadata(@PathVariable("targetId") String tar * the key of the meta data to delete * @return status OK if the delete request is successful */ + @Operation(summary = "Deletes a single meta data entry from a target", description = "Delete a single meta data. Required permission: UPDATE_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/metadata/{metadataKey}") ResponseEntity deleteMetadata(@PathVariable("targetId") String targetId, @PathVariable("metadataKey") String metadataKey); @@ -408,6 +640,19 @@ ResponseEntity deleteMetadata(@PathVariable("targetId") String targetId, * @return status created if post request is successful with the value of * the created meta data */ + @Operation(summary = "Create a list of meta data for a specific target", description = "Create a list of meta data entries Required permissions: READ_REPOSITORY and UPDATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/metadata", consumes = { MediaType.APPLICATION_JSON_VALUE, MediaTypes.HAL_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -421,6 +666,17 @@ ResponseEntity> createMetadata(@PathVariable("targetId") Stri * to check the state for * @return the current state as {@link MgmtTargetAutoConfirm} */ + @Operation(summary = "Return the current auto-confitm state for a specific target", description = "Handles the GET request to check the current auto-confirmation state of a target. Required Permission: READ_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/autoConfirm", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getAutoConfirmStatus(@PathVariable("targetId") String targetId); @@ -435,6 +691,19 @@ ResponseEntity> createMetadata(@PathVariable("targetId") Stri * @return {@link org.springframework.http.HttpStatus#OK} in case of a * success */ + @Operation(summary = "Activate auto-confirm on a specific target", description = "Handles the POST request to activate auto-confirmation for a specific target. As a result all current active as well as future actions will automatically be confirmed by mentioning the initiator as triggered person. Actions will be automatically confirmed, as long as auto-confirmation is active. Required Permission: UPDATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/autoConfirm/activate") ResponseEntity activateAutoConfirm(@PathVariable("targetId") String targetId, @RequestBody(required = false) MgmtTargetAutoConfirmUpdate update); @@ -448,6 +717,19 @@ ResponseEntity activateAutoConfirm(@PathVariable("targetId") String target * @return {@link org.springframework.http.HttpStatus#OK} in case of a * success */ + @Operation(summary = "Deactivate auto-confirm on a specific target", description = "Handles the POST request to deactivate auto-confirmation for a specific target. All active actions will remain unchanged while all future actions need to be confirmed, before processing with the deployment. Required Permission: UPDATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/autoConfirm/deactivate") ResponseEntity deactivateAutoConfirm(@PathVariable("targetId") String targetId); diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetTagRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetTagRestApi.java index ee60b96110..df9978b83e 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetTagRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetTagRestApi.java @@ -1,21 +1,29 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; import java.util.List; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import org.eclipse.hawkbit.mgmt.json.model.PagedList; import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtAssignedTargetRequestBody; import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTag; import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTagRequestBodyPut; import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTargetTagAssigmentResult; import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget; +import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -30,6 +38,7 @@ * REST Resource handling for TargetTag CRUD operations. */ // no request mapping specified here to avoid CVE-2021-22044 in Feign client +@Tag(name = "Target Tags", description = "REST API for Target Tag CRUD operations.") public interface MgmtTargetTagRestApi { /** @@ -51,6 +60,16 @@ public interface MgmtTargetTagRestApi { * with status OK. The response is always paged. In any failure the * JsonResponseExceptionHandler is handling the response. */ + @Operation(summary = "Return all target tags", description = "Handles the GET request of retrieving all target tags.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication."), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies."), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource."), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json."), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.") + }) @GetMapping(value = MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getTargetTags( @@ -67,6 +86,17 @@ ResponseEntity> getTargetTags( * * @return a single target tag with status OK. */ + @Operation(summary = "Return target tag by id", description = "Handles the GET request of retrieving a single target tag.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication."), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies."), + @ApiResponse(responseCode = "404", description = "Target tag not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource."), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json."), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.") + }) @GetMapping(value = MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING + "/{targetTagId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getTargetTag(@PathVariable("targetTagId") Long targetTagId); @@ -81,6 +111,18 @@ ResponseEntity> getTargetTags( * with status code 201 - Created. The Response Body are the created * target tags but without ResponseBody. */ + @Operation(summary = "Create target tag(s)", description = "Handles the POST request of creating new target tag. The request body must always be a list of target tags.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication."), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies."), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource."), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json."), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request."), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource."), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.") + }) @PostMapping(value = MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -96,6 +138,19 @@ ResponseEntity> getTargetTags( * the the request body to be updated * @return status OK if update is successful and the updated target tag. */ + @Operation(summary = "Update target tag by id", description = "Handles the PUT request of updating a target tag.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication."), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies."), + @ApiResponse(responseCode = "404", description = "Target tag not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource."), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json."), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request."), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource."), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.") + }) @PutMapping(value = MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING + "/{targetTagId}", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -110,6 +165,17 @@ ResponseEntity updateTargetTag(@PathVariable("targetTagId") Long target * @return status OK if delete as successfully. * */ + @Operation(summary = "Delete target tag by id", description = "Handles the DELETE request of deleting a single target tag.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication."), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies."), + @ApiResponse(responseCode = "404", description = "Target tag not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource."), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json."), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.") + }) @DeleteMapping(value = MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING + "/{targetTagId}") ResponseEntity deleteTargetTag(@PathVariable("targetTagId") Long targetTagId); @@ -134,6 +200,17 @@ ResponseEntity updateTargetTag(@PathVariable("targetTagId") Long target * * @return the list of assigned targets. */ + @Operation(summary = "Return assigned targets for tag", description = "Handles the GET request of retrieving a list of assigned targets.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication."), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies."), + @ApiResponse(responseCode = "404", description = "Target tag not found", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource."), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json."), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.") + }) @GetMapping(value = MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING + MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -154,6 +231,18 @@ ResponseEntity> getAssignedTargets(@PathVariable("targetTa * * @return the list of assigned targets and unassigned targets. */ + @Operation(summary = "Toggles target tag assignment", description = "Handles the POST request of toggle target assignment. The request body must always be a list of controller ids.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication."), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies."), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource."), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json."), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request."), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource."), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.") + }) @PostMapping(value = MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING + MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING + "/toggleTagAssignment", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { @@ -171,6 +260,18 @@ ResponseEntity toggleTagAssignment(@PathVariable(" * * @return the list of assigned targets. */ + @Operation(summary = "Assign target(s) to given tagId", description = "Handles the POST request of target assignment. Already assigned target will be ignored.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication."), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies."), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource."), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json."), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request."), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource."), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.") + }) @PostMapping(value = MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING + MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, @@ -187,6 +288,17 @@ ResponseEntity> assignTargets(@PathVariable("targetTagId") Long * the ID of the target to unassign * @return http status code */ + @Operation(summary = "Unassign target from a given tagId", description = "Handles the DELETE request to unassign the given target.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication."), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies."), + @ApiResponse(responseCode = "404", description = "Target not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource."), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json."), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.") + }) @DeleteMapping(value = MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING + MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING + "/{controllerId}") ResponseEntity unassignTarget(@PathVariable("targetTagId") Long targetTagId, diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetTypeRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetTypeRestApi.java index 074e1dee68..df8c139fe2 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetTypeRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTargetTypeRestApi.java @@ -1,21 +1,29 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; import java.util.List; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import org.eclipse.hawkbit.mgmt.json.model.PagedList; import org.eclipse.hawkbit.mgmt.json.model.distributionsettype.MgmtDistributionSetType; import org.eclipse.hawkbit.mgmt.json.model.distributionsettype.MgmtDistributionSetTypeAssignment; import org.eclipse.hawkbit.mgmt.json.model.targettype.MgmtTargetType; import org.eclipse.hawkbit.mgmt.json.model.targettype.MgmtTargetTypeRequestBodyPost; import org.eclipse.hawkbit.mgmt.json.model.targettype.MgmtTargetTypeRequestBodyPut; +import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -30,6 +38,7 @@ * REST Resource handling for TargetType CRUD operations. */ // no request mapping specified here to avoid CVE-2021-22044 in Feign client +@Tag(name = "Target Types", description = "REST API for Target Type CRUD operations.") public interface MgmtTargetTypeRestApi { /** @@ -53,6 +62,16 @@ public interface MgmtTargetTypeRestApi { * with status OK. The response is always paged. In any failure the * JsonResponseExceptionHandler is handling the response. */ + @Operation(summary = "Return all target types", description = "Handles the GET request of retrieving all target types.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGETTYPE_V1_REQUEST_MAPPING, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getTargetTypes( @@ -69,6 +88,17 @@ ResponseEntity> getTargetTypes( * * @return a single target type with status OK. */ + @Operation(summary = "Return target type by id", description = "Handles the GET request of retrieving a single target type") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGETTYPE_V1_REQUEST_MAPPING + "/{targetTypeId}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getTargetType(@PathVariable("targetTypeId") Long targetTypeId); @@ -81,6 +111,17 @@ ResponseEntity> getTargetTypes( * @return status OK if delete is successful. * */ + @Operation(summary = "Delete target type by id", description = "Handles the DELETE request for a single target type. Required Permission: DELETE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.TARGETTYPE_V1_REQUEST_MAPPING + "/{targetTypeId}") ResponseEntity deleteTargetType(@PathVariable("targetTypeId") Long targetTypeId); @@ -93,6 +134,19 @@ ResponseEntity> getTargetTypes( * the target type to be updated. * @return status OK if update is successful */ + @Operation(summary = "Update target type by id", description = "Handles the PUT request for a single target type. Required Permission: UPDATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = MgmtRestConstants.TARGETTYPE_V1_REQUEST_MAPPING + "/{targetTypeId}", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -110,6 +164,19 @@ ResponseEntity updateTargetType(@PathVariable("targetTypeId") Lo * ResponseBody. In any failure the JsonResponseExceptionHandler is * handling the response. */ + @Operation(summary = "Create target types", description = "Handles the POST request for creating new target types. The request body must always be a list of types. Required Permission: CREATE_TARGET") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Target type not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.TARGETTYPE_V1_REQUEST_MAPPING, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -123,6 +190,17 @@ ResponseEntity updateTargetType(@PathVariable("targetTypeId") Lo * of the TargetType. * @return Unpaged list of distribution set types and OK in case of success. */ + @Operation(summary = "Return list of compatible distribution set types", description = "Handles the GET request of retrieving the list of compatible distribution set types in that target type. Required Permission: READ_TARGET, READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution set type was not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.TARGETTYPE_V1_REQUEST_MAPPING + "/{targetTypeId}/" + MgmtRestConstants.TARGETTYPE_V1_DS_TYPES, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -140,6 +218,17 @@ ResponseEntity> getCompatibleDistributionSets( * * @return OK if the request was successful */ + @Operation(summary = "Remove compatibility of distribution set type from the target type", description = "Handles the DELETE request for removing a distribution set type from a single target type. Required Permission: UPDATE_TARGET and READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution set type was not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.TARGETTYPE_V1_REQUEST_MAPPING + "/{targetTypeId}/" + MgmtRestConstants.TARGETTYPE_V1_DS_TYPES + "/{distributionSetTypeId}") ResponseEntity removeCompatibleDistributionSet(@PathVariable("targetTypeId") Long targetTypeId, @@ -156,6 +245,19 @@ ResponseEntity removeCompatibleDistributionSet(@PathVariable("targetTypeId * * @return OK if the request was successful */ + @Operation(summary = "Adding compatibility of a distribution set type to a target type", description = "Handles the POST request for adding compatible distribution set types to a target type. Required Permission: UPDATE_TARGET and READ_REPOSITORY") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Distribution set type was not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PostMapping(value = MgmtRestConstants.TARGETTYPE_V1_REQUEST_MAPPING + "/{targetTypeId}/" + MgmtRestConstants.TARGETTYPE_V1_DS_TYPES, consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTenantManagementRestApi.java b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTenantManagementRestApi.java index cf4be7d70f..21c923b10b 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTenantManagementRestApi.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/main/java/org/eclipse/hawkbit/mgmt/rest/api/MgmtTenantManagementRestApi.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.api; @@ -12,8 +13,15 @@ import java.util.List; import java.util.Map; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; import org.eclipse.hawkbit.mgmt.json.model.system.MgmtSystemTenantConfigurationValue; import org.eclipse.hawkbit.mgmt.json.model.system.MgmtSystemTenantConfigurationValueRequest; +import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -27,6 +35,7 @@ * REST Resource for handling tenant specific configuration operations. */ // no request mapping specified here to avoid CVE-2021-22044 in Feign client +@Tag(name = "System Configuration", description = "REST API for handling tenant specific configuration operations.") public interface MgmtTenantManagementRestApi { /** @@ -35,6 +44,16 @@ public interface MgmtTenantManagementRestApi { * * @return a map of all configuration values. */ + @Operation(summary = "Return all tenant specific configuration values", description = "The GET request returns a list of all possible configuration keys for the tenant. Required Permission: TENANT_CONFIGURATION") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity> getTenantConfiguration(); @@ -49,6 +68,16 @@ public interface MgmtTenantManagementRestApi { * OK. In any failure the JsonResponseExceptionHandler is handling * the response. */ + @Operation(summary = "Delete a tenant specific configuration value", description = "The DELETE request removes a tenant specific configuration value for the tenant. Afterwards the global default value is used. Required Permission: TENANT_CONFIGURATION") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @DeleteMapping(value = MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/{keyName}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity deleteTenantConfigurationValue(@PathVariable("keyName") String keyName); @@ -63,6 +92,17 @@ public interface MgmtTenantManagementRestApi { * In any failure the JsonResponseExceptionHandler is handling the * response. */ + @Operation(summary = "Return a tenant specific configuration value", description = "The GET request returns the configuration value of a specific configuration key for the tenant. Required Permission: TENANT_CONFIGURATION") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Configuration key not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @GetMapping(value = MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/{keyName}", produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) ResponseEntity getTenantConfigurationValue( @@ -80,6 +120,19 @@ ResponseEntity getTenantConfigurationValue( * In any failure the JsonResponseExceptionHandler is handling the * response. */ + @Operation(summary = "Update a tenant specific configuration value.", description = "The PUT request changes a configuration value of a specific configuration key for the tenant. Required Permission: TENANT_CONFIGURATION") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "404", description = "Configuration key not found.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/{keyName}", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) @@ -96,6 +149,18 @@ ResponseEntity updateTenantConfigurationValu * In any failure the JsonResponseExceptionHandler is handling the * response. */ + @Operation(summary = "Batch update of tenant configuration.", description = "The PUT request updates the whole configuration for the tenant. Required Permission: TENANT_CONFIGURATION") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Successfully retrieved"), + @ApiResponse(responseCode = "400", description = "Bad Request - e.g. invalid parameters", content = @Content(mediaType = "application/json", schema = @Schema(implementation = ExceptionInfo.class))), + @ApiResponse(responseCode = "401", description = "The request requires user authentication.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "403", description = "Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "405", description = "The http request method is not allowed on the resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "406", description = "In case accept header is specified and not application/json.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "409", description = "E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "415", description = "The request was attempt with a media-type which is not supported by the server for this resource.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))), + @ApiResponse(responseCode = "429", description = "Too many requests. The server will refuse further attempts and the client has to wait another second.", content = @Content(mediaType = "application/json", schema = @Schema(hidden = true))) + }) @PutMapping(value = MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs", consumes = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }, produces = { MediaTypes.HAL_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE }) diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/PagedListTest.java b/hawkbit-rest/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/PagedListTest.java index 6de396276b..6e8d1b9e9b 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/PagedListTest.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/PagedListTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model; diff --git a/hawkbit-rest/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBodyTest.java b/hawkbit-rest/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBodyTest.java index 914b9c384c..c9707fd533 100644 --- a/hawkbit-rest/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBodyTest.java +++ b/hawkbit-rest/hawkbit-mgmt-api/src/test/java/org/eclipse/hawkbit/mgmt/json/model/distributionset/MgmtTargetAssignmentResponseBodyTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.json.model.distributionset; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/pom.xml b/hawkbit-rest/hawkbit-mgmt-resource/pom.xml index 33082e4eba..841be974ae 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/pom.xml +++ b/hawkbit-rest/hawkbit-mgmt-resource/pom.xml @@ -1,11 +1,12 @@ > getAutoAssignTargetFilte return ResponseEntity .ok(new PagedList<>(MgmtTargetFilterQueryMapper.toResponse(targetFilterQueries.getContent(), - tenantConfigHelper.isConfirmationFlowEnabled()), targetFilterQueries.getTotalElements())); + tenantConfigHelper.isConfirmationFlowEnabled(), false), targetFilterQueries.getTotalElements())); } @Override diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResource.java index 81a058ab8b..12ef463ed9 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeMapper.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeMapper.java index ac6750add5..d8ed5ff041 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeMapper.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResource.java index f71f72e206..d21dedb14f 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadArtifactResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadArtifactResource.java index d1ae84aef3..74238bb7ab 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadArtifactResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadArtifactResource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadResource.java index d4b90e3b28..2a1eb2be86 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadResource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRestModelMapper.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRestModelMapper.java index d34786a12e..1fc282831a 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRestModelMapper.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRestModelMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutMapper.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutMapper.java index 74b20db567..7ed3d683da 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutMapper.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -131,6 +132,18 @@ static RolloutCreate fromRequest(final EntityFactory entityFactory, final MgmtRo .weight(restRequest.getWeight()); } + static RolloutCreate fromRetriedRollout(final EntityFactory entityFactory, final Rollout rollout) { + return entityFactory.rollout().create() + .name(rollout.getName().concat("_retry")) + .description(rollout.getDescription()) + .set(rollout.getDistributionSet()) + .targetFilterQuery("failedrollout==".concat(String.valueOf(rollout.getId()))) + .actionType(rollout.getActionType()) + .forcedTime(rollout.getForcedTime()) + .startAt(rollout.getStartAt()) + .weight(null); + } + static RolloutGroupCreate fromRequest(final EntityFactory entityFactory, final MgmtRolloutGroup restRequest) { return entityFactory.rolloutGroup().create().name(restRequest.getName()) diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java index 18d8cf69d8..72b85a44f0 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResource.java @@ -1,13 +1,21 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Collectors; + +import javax.validation.ValidationException; + import org.eclipse.hawkbit.mgmt.json.model.PagedList; import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutResponseBody; import org.eclipse.hawkbit.mgmt.json.model.rollout.MgmtRolloutRestRequestBody; @@ -17,12 +25,24 @@ import org.eclipse.hawkbit.mgmt.rest.api.MgmtRepresentationMode; import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; import org.eclipse.hawkbit.mgmt.rest.api.MgmtRolloutRestApi; -import org.eclipse.hawkbit.repository.*; +import org.eclipse.hawkbit.repository.DistributionSetManagement; +import org.eclipse.hawkbit.repository.EntityFactory; +import org.eclipse.hawkbit.repository.OffsetBasedPageRequest; +import org.eclipse.hawkbit.repository.RolloutGroupManagement; +import org.eclipse.hawkbit.repository.RolloutManagement; +import org.eclipse.hawkbit.repository.TargetFilterQueryManagement; +import org.eclipse.hawkbit.repository.TargetManagement; +import org.eclipse.hawkbit.repository.TenantConfigurationManagement; import org.eclipse.hawkbit.repository.builder.RolloutCreate; import org.eclipse.hawkbit.repository.builder.RolloutGroupCreate; import org.eclipse.hawkbit.repository.exception.EntityNotFoundException; import org.eclipse.hawkbit.repository.exception.RSQLParameterSyntaxException; -import org.eclipse.hawkbit.repository.model.*; +import org.eclipse.hawkbit.repository.model.DistributionSet; +import org.eclipse.hawkbit.repository.model.Rollout; +import org.eclipse.hawkbit.repository.model.RolloutGroup; +import org.eclipse.hawkbit.repository.model.RolloutGroupConditionBuilder; +import org.eclipse.hawkbit.repository.model.RolloutGroupConditions; +import org.eclipse.hawkbit.repository.model.Target; import org.eclipse.hawkbit.security.SystemSecurityContext; import org.eclipse.hawkbit.utils.TenantConfigHelper; import org.slf4j.Logger; @@ -96,7 +116,7 @@ public ResponseEntity> getRollouts( rollouts = this.rolloutManagement.findByRsql(pageable, rsqlParam, false); } else { rollouts = this.rolloutManagement.findAll(pageable, false); - } + } final long totalElements = rollouts.getTotalElements(); @@ -298,6 +318,28 @@ public ResponseEntity triggerNextGroup(@PathVariable("rolloutId") final Lo return ResponseEntity.ok().build(); } + @Override + public ResponseEntity retryRollout(final Long rolloutId) { + final Rollout rolloutForRetry = this.rolloutManagement.get(rolloutId) + .orElseThrow(() -> new EntityNotFoundException(Rollout.class, rolloutId)); + + if (rolloutForRetry.isDeleted()) { + throw new EntityNotFoundException(Rollout.class, rolloutId); + } + + if (!rolloutForRetry.getStatus().equals(Rollout.RolloutStatus.FINISHED)) { + throw new ValidationException("Rollout must be finished in order to be retried!"); + } + + final RolloutCreate create = MgmtRolloutMapper.fromRetriedRollout(entityFactory, rolloutForRetry); + final RolloutGroupConditions groupConditions = new RolloutGroupConditionBuilder().withDefaults().build(); + + final Rollout retriedRollout = rolloutManagement.create(create, 1, false, + groupConditions); + + return ResponseEntity.status(HttpStatus.CREATED).body(MgmtRolloutMapper.toResponseRollout(retriedRollout, true)); + } + private static MgmtRepresentationMode parseRepresentationMode(final String representationModeParam) { return MgmtRepresentationMode.fromValue(representationModeParam).orElseGet(() -> { // no need for a 400, just apply a safe fallback diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleMapper.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleMapper.java index 3f3c52ea92..c02fba4d3b 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleMapper.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResource.java index 7f3fe6d41d..b626e62fca 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -57,8 +58,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import javax.validation.ValidationException; - /** * REST Resource handling for {@link SoftwareModule} and related * {@link Artifact} CRUD operations. diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeMapper.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeMapper.java index 36a22122b6..3e8ef51a22 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeMapper.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResource.java index b6d95a7f68..4773e92980 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSystemManagementResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSystemManagementResource.java index b6dd2c3f74..df268ec2ea 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSystemManagementResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSystemManagementResource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTagMapper.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTagMapper.java index da15885d4e..4958217e8f 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTagMapper.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTagMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryMapper.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryMapper.java index 05add94ae7..e566b09bb0 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryMapper.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -18,6 +19,9 @@ import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtDistributionSetAutoAssignment; import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQuery; import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQueryRequestBody; +import org.eclipse.hawkbit.mgmt.rest.api.MgmtDistributionSetRestApi; +import org.eclipse.hawkbit.mgmt.rest.api.MgmtRepresentationMode; +import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; import org.eclipse.hawkbit.mgmt.rest.api.MgmtTargetFilterQueryRestApi; import org.eclipse.hawkbit.repository.EntityFactory; import org.eclipse.hawkbit.repository.builder.AutoAssignDistributionSetUpdate; @@ -25,6 +29,7 @@ import org.eclipse.hawkbit.repository.model.Action.ActionType; import org.eclipse.hawkbit.repository.model.DistributionSet; import org.eclipse.hawkbit.repository.model.TargetFilterQuery; +import org.springframework.hateoas.Link; import org.springframework.util.CollectionUtils; /** @@ -39,14 +44,15 @@ private MgmtTargetFilterQueryMapper() { } static List toResponse(final List filters, - final boolean confirmationFlowEnabled) { + final boolean confirmationFlowEnabled, final boolean isRepresentationFull) { if (CollectionUtils.isEmpty(filters)) { return Collections.emptyList(); } - return filters.stream().map(filter -> toResponse(filter, confirmationFlowEnabled)).collect(Collectors.toList()); + return filters.stream().map(filter -> toResponse(filter, confirmationFlowEnabled, isRepresentationFull)).collect(Collectors.toList()); } - static MgmtTargetFilterQuery toResponse(final TargetFilterQuery filter, final boolean confirmationFlowEnabled) { + static MgmtTargetFilterQuery toResponse(final TargetFilterQuery filter, final boolean confirmationFlowEnabled, + final boolean isReprentationFull) { final MgmtTargetFilterQuery targetRest = new MgmtTargetFilterQuery(); targetRest.setFilterId(filter.getId()); targetRest.setName(filter.getName()); @@ -70,6 +76,12 @@ static MgmtTargetFilterQuery toResponse(final TargetFilterQuery filter, final bo targetRest.add( linkTo(methodOn(MgmtTargetFilterQueryRestApi.class).getFilter(filter.getId())).withSelfRel().expand()); + if (isReprentationFull && distributionSet != null) { + targetRest.add( + linkTo(methodOn(MgmtDistributionSetRestApi.class).getDistributionSets(Integer.parseInt(MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET), + Integer.parseInt(MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT), null, + "name==" + distributionSet.getName() + ";version==" + distributionSet.getVersion())).withRel("DS").expand()); + } return targetRest; } diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResource.java index 39b52561c3..1228c485ff 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -16,6 +17,7 @@ import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtDistributionSetAutoAssignment; import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQuery; import org.eclipse.hawkbit.mgmt.json.model.targetfilter.MgmtTargetFilterQueryRequestBody; +import org.eclipse.hawkbit.mgmt.rest.api.MgmtRepresentationMode; import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; import org.eclipse.hawkbit.mgmt.rest.api.MgmtTargetFilterQueryRestApi; import org.eclipse.hawkbit.repository.EntityFactory; @@ -72,7 +74,7 @@ public ResponseEntity getFilter(@PathVariable("filterId") final TargetFilterQuery findTarget = findFilterWithExceptionIfNotFound(filterId); // to single response include poll status final MgmtTargetFilterQuery response = MgmtTargetFilterQueryMapper.toResponse(findTarget, - tenantConfigHelper.isConfirmationFlowEnabled()); + tenantConfigHelper.isConfirmationFlowEnabled(), true); MgmtTargetFilterQueryMapper.addLinks(response); return ResponseEntity.ok(response); @@ -83,7 +85,9 @@ public ResponseEntity> getFilters( @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_OFFSET, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_OFFSET) final int pagingOffsetParam, @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_PAGING_LIMIT, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_PAGING_DEFAULT_LIMIT) final int pagingLimitParam, @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SORTING, required = false) final String sortParam, - @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) final String rsqlParam) { + @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_SEARCH, required = false) final String rsqlParam, + @RequestParam(value = MgmtRestConstants.REQUEST_PARAMETER_REPRESENTATION_MODE, defaultValue = MgmtRestConstants.REQUEST_PARAMETER_REPRESENTATION_MODE_DEFAULT) String representationModeParam) { + final int sanitizedOffsetParam = PagingUtility.sanitizeOffsetParam(pagingOffsetParam); final int sanitizedLimitParam = PagingUtility.sanitizePageLimitParam(pagingLimitParam); @@ -101,8 +105,10 @@ public ResponseEntity> getFilters( countTargetsAll = filterManagement.count(); } + final boolean isRepresentationFull = parseRepresentationMode(representationModeParam) == MgmtRepresentationMode.FULL; + final List rest = MgmtTargetFilterQueryMapper - .toResponse(findTargetFiltersAll.getContent(), tenantConfigHelper.isConfirmationFlowEnabled()); + .toResponse(findTargetFiltersAll.getContent(), tenantConfigHelper.isConfirmationFlowEnabled(), isRepresentationFull); return ResponseEntity.ok(new PagedList<>(rest, countTargetsAll)); } @@ -113,7 +119,7 @@ public ResponseEntity createFilter( .create(MgmtTargetFilterQueryMapper.fromRequest(entityFactory, filter)); final MgmtTargetFilterQuery response = MgmtTargetFilterQueryMapper.toResponse(createdTarget, - tenantConfigHelper.isConfirmationFlowEnabled()); + tenantConfigHelper.isConfirmationFlowEnabled(), false); MgmtTargetFilterQueryMapper.addLinks(response); return new ResponseEntity<>(response, HttpStatus.CREATED); @@ -129,7 +135,7 @@ public ResponseEntity updateFilter(@PathVariable("filterI .query(targetFilterRest.getQuery())); final MgmtTargetFilterQuery response = MgmtTargetFilterQueryMapper.toResponse(updateFilter, - tenantConfigHelper.isConfirmationFlowEnabled()); + tenantConfigHelper.isConfirmationFlowEnabled(), false); MgmtTargetFilterQueryMapper.addLinks(response); return ResponseEntity.ok(response); @@ -157,7 +163,7 @@ public ResponseEntity postAssignedDistributionSet( final TargetFilterQuery updateFilter = filterManagement.updateAutoAssignDS(update); final MgmtTargetFilterQuery response = MgmtTargetFilterQueryMapper.toResponse(updateFilter, - tenantConfigHelper.isConfirmationFlowEnabled()); + tenantConfigHelper.isConfirmationFlowEnabled(), false); MgmtTargetFilterQueryMapper.addLinks(response); return ResponseEntity.ok(response); @@ -197,4 +203,12 @@ public ResponseEntity> getResults(@PathVariable("filterId") final L return ResponseEntity.ok(findAll.stream().map(target -> target.getControllerId()).collect(Collectors.toList())); } + private static MgmtRepresentationMode parseRepresentationMode(final String representationModeParam) { + return MgmtRepresentationMode.fromValue(representationModeParam).orElseGet(() -> { + // no need for a 400, just apply a safe fallback + LOG.warn("Received an invalid representation mode: {}", representationModeParam); + return MgmtRepresentationMode.COMPACT; + }); + } + } diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetMapper.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetMapper.java index 36282ac888..118198b956 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetMapper.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResource.java index 03a920de38..af839e6e8c 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResource.java @@ -1,13 +1,25 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; +import java.util.AbstractMap.SimpleEntry; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.function.Function; +import java.util.stream.Collectors; + +import javax.validation.Valid; +import javax.validation.ValidationException; + import org.eclipse.hawkbit.mgmt.json.model.MgmtId; import org.eclipse.hawkbit.mgmt.json.model.MgmtMetadata; import org.eclipse.hawkbit.mgmt.json.model.MgmtMetadataBodyPut; @@ -24,6 +36,27 @@ import org.eclipse.hawkbit.repository.*; import org.eclipse.hawkbit.repository.exception.EntityNotFoundException; import org.eclipse.hawkbit.repository.model.*; +import org.eclipse.hawkbit.mgmt.json.model.target.MgmtDistributionSetAssignments; +import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTarget; +import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTargetAttributes; +import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTargetAutoConfirm; +import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTargetAutoConfirmUpdate; +import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTargetRequestBody; +import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; +import org.eclipse.hawkbit.mgmt.rest.api.MgmtTargetRestApi; +import org.eclipse.hawkbit.repository.ConfirmationManagement; +import org.eclipse.hawkbit.repository.DeploymentManagement; +import org.eclipse.hawkbit.repository.EntityFactory; +import org.eclipse.hawkbit.repository.OffsetBasedPageRequest; +import org.eclipse.hawkbit.repository.TargetManagement; +import org.eclipse.hawkbit.repository.TenantConfigurationManagement; +import org.eclipse.hawkbit.repository.exception.EntityNotFoundException; +import org.eclipse.hawkbit.repository.model.Action; +import org.eclipse.hawkbit.repository.model.ActionStatus; +import org.eclipse.hawkbit.repository.model.DeploymentRequest; +import org.eclipse.hawkbit.repository.model.DistributionSetAssignmentResult; +import org.eclipse.hawkbit.repository.model.Target; +import org.eclipse.hawkbit.repository.model.TargetMetadata; import org.eclipse.hawkbit.security.SystemSecurityContext; import org.eclipse.hawkbit.utils.TenantConfigHelper; import org.slf4j.Logger; @@ -145,14 +178,14 @@ public ResponseEntity updateTarget(@PathVariable("targetId") final S this.targetManagement.unAssignType(targetId); // update target without targetType here ... updateTarget = this.targetManagement.update(entityFactory.target().update(targetId) - .name(targetRest.getName()).description(targetRest.getDescription()).address(targetRest.getAddress()) - .securityToken(targetRest.getSecurityToken()).requestAttributes(targetRest.isRequestAttributes())); + .name(targetRest.getName()).description(targetRest.getDescription()).address(targetRest.getAddress()) + .securityToken(targetRest.getSecurityToken()).requestAttributes(targetRest.isRequestAttributes())); } else { updateTarget = this.targetManagement.update( - entityFactory.target().update(targetId).name(targetRest.getName()).description(targetRest.getDescription()) - .address(targetRest.getAddress()).targetType(targetRest.getTargetType()).securityToken(targetRest.getSecurityToken()) - .requestAttributes(targetRest.isRequestAttributes())); + entityFactory.target().update(targetId).name(targetRest.getName()).description(targetRest.getDescription()) + .address(targetRest.getAddress()).targetType(targetRest.getTargetType()).securityToken(targetRest.getSecurityToken()) + .requestAttributes(targetRest.isRequestAttributes())); } diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResource.java index fb639b1213..647666a8fe 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeMapper.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeMapper.java index 26baf1f395..236377a0f3 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeMapper.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeResource.java index 2e19edcc9f..d3d354cd25 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeResource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementMapper.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementMapper.java index fc9cbf3563..eb91d17895 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementMapper.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementMapper.java @@ -1,58 +1,49 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo; import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn; - -import java.util.Map; -import java.util.stream.Collectors; - import org.eclipse.hawkbit.mgmt.json.model.system.MgmtSystemTenantConfigurationValue; -import org.eclipse.hawkbit.repository.TenantConfigurationManagement; import org.eclipse.hawkbit.repository.model.TenantConfigurationValue; -import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties; -import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties.TenantConfigurationKey; /** * A mapper which maps repository model to RESTful model representation and * back. */ public final class MgmtTenantManagementMapper { + public static String DEFAULT_DISTRIBUTION_SET_TYPE_KEY = "default.ds.type"; private MgmtTenantManagementMapper() { // Utility class } - static Map toResponse( - final TenantConfigurationManagement tenantConfigurationManagement, - final TenantConfigurationProperties tenantConfigurationProperties) { - - return tenantConfigurationProperties.getConfigurationKeys().stream() - .collect(Collectors.toMap(TenantConfigurationKey::getKeyName, key -> toResponse(key.getKeyName(), - tenantConfigurationManagement.getConfigurationValue(key.getKeyName())))); - } - - static MgmtSystemTenantConfigurationValue toResponse(final String key, - final TenantConfigurationValue repoConfValue) { + public static MgmtSystemTenantConfigurationValue toResponseTenantConfigurationValue(String key, TenantConfigurationValue repoConfValue) { final MgmtSystemTenantConfigurationValue restConfValue = new MgmtSystemTenantConfigurationValue(); - restConfValue.setValue(repoConfValue.getValue()); restConfValue.setGlobal(repoConfValue.isGlobal()); restConfValue.setCreatedAt(repoConfValue.getCreatedAt()); restConfValue.setCreatedBy(repoConfValue.getCreatedBy()); restConfValue.setLastModifiedAt(repoConfValue.getLastModifiedAt()); restConfValue.setLastModifiedBy(repoConfValue.getLastModifiedBy()); - restConfValue.add(linkTo(methodOn(MgmtTenantManagementResource.class).getTenantConfigurationValue(key)) .withSelfRel().expand()); + return restConfValue; + } + public static MgmtSystemTenantConfigurationValue toResponseDefaultDsType(Long defaultDistributionSetType) { + final MgmtSystemTenantConfigurationValue restConfValue = new MgmtSystemTenantConfigurationValue(); + restConfValue.setValue(defaultDistributionSetType); + restConfValue.setGlobal(Boolean.FALSE); + restConfValue.add(linkTo(methodOn(MgmtTenantManagementResource.class).getTenantConfigurationValue(DEFAULT_DISTRIBUTION_SET_TYPE_KEY)) + .withSelfRel().expand()); return restConfValue; } } diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResource.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResource.java index cebc32faeb..2046e69277 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResource.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -12,13 +13,16 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; import org.eclipse.hawkbit.mgmt.json.model.system.MgmtSystemTenantConfigurationValue; import org.eclipse.hawkbit.mgmt.json.model.system.MgmtSystemTenantConfigurationValueRequest; import org.eclipse.hawkbit.mgmt.rest.api.MgmtTenantManagementRestApi; +import org.eclipse.hawkbit.repository.SystemManagement; import org.eclipse.hawkbit.repository.TenantConfigurationManagement; import org.eclipse.hawkbit.repository.model.TenantConfigurationValue; import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties; +import org.eclipse.hawkbit.tenancy.configuration.validator.TenantConfigurationValidatorException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; @@ -37,45 +41,77 @@ public class MgmtTenantManagementResource implements MgmtTenantManagementRestApi private final TenantConfigurationManagement tenantConfigurationManagement; private final TenantConfigurationProperties tenantConfigurationProperties; + private final SystemManagement systemManagement; MgmtTenantManagementResource(final TenantConfigurationManagement tenantConfigurationManagement, - final TenantConfigurationProperties tenantConfigurationProperties) { + final TenantConfigurationProperties tenantConfigurationProperties, + final SystemManagement systemManagement) { this.tenantConfigurationManagement = tenantConfigurationManagement; this.tenantConfigurationProperties = tenantConfigurationProperties; + this.systemManagement = systemManagement; } @Override public ResponseEntity> getTenantConfiguration() { - return ResponseEntity.ok( - MgmtTenantManagementMapper.toResponse(tenantConfigurationManagement, tenantConfigurationProperties)); + //Load and Construct default Tenant Configuration + Map tenantConfigurationValueMap = tenantConfigurationProperties.getConfigurationKeys().stream().collect( + Collectors.toMap(TenantConfigurationProperties.TenantConfigurationKey::getKeyName, + key -> loadTenantConfigurationValueBy(key.getKeyName()))); + //Load and Add Default DistributionSetType + MgmtSystemTenantConfigurationValue defaultDsTypeId = loadTenantConfigurationValueBy(MgmtTenantManagementMapper.DEFAULT_DISTRIBUTION_SET_TYPE_KEY); + tenantConfigurationValueMap.put(MgmtTenantManagementMapper.DEFAULT_DISTRIBUTION_SET_TYPE_KEY, defaultDsTypeId); + //return combined TenantConfiguration and TenantMetadata + LOG.debug("getTenantConfiguration, return status {}", HttpStatus.OK); + return ResponseEntity.ok(tenantConfigurationValueMap); } @Override - public ResponseEntity deleteTenantConfigurationValue(@PathVariable("keyName") final String keyName) { + public ResponseEntity getTenantConfigurationValue( + @PathVariable("keyName") final String keyName) { + return ResponseEntity.ok(loadTenantConfigurationValueBy(keyName)); + } - tenantConfigurationManagement.deleteConfiguration(keyName); + private MgmtSystemTenantConfigurationValue loadTenantConfigurationValueBy(String keyName) { - LOG.debug("{} config value deleted, return status {}", keyName, HttpStatus.OK); - return ResponseEntity.ok().build(); + //Check if requested key is TenantConfiguration or TenantMetadata, load it and return it as rest response + MgmtSystemTenantConfigurationValue response; + if (isDefaultDistributionSetTypeKey(keyName)) { + response = MgmtTenantManagementMapper.toResponseDefaultDsType(systemManagement.getTenantMetadata().getDefaultDsType().getId()); + } else { + response = MgmtTenantManagementMapper.toResponseTenantConfigurationValue(keyName, tenantConfigurationManagement.getConfigurationValue(keyName)); + } + return response; } @Override - public ResponseEntity getTenantConfigurationValue( - @PathVariable("keyName") final String keyName) { + public ResponseEntity deleteTenantConfigurationValue(@PathVariable("keyName") final String keyName) { + + //Default DistributionSet Type cannot be deleted as is part of TenantMetadata + if (isDefaultDistributionSetTypeKey(keyName)) { + return ResponseEntity.badRequest().build(); + } + + tenantConfigurationManagement.deleteConfiguration(keyName); - LOG.debug("{} config value getted, return status {}", keyName, HttpStatus.OK); - return ResponseEntity.ok(MgmtTenantManagementMapper.toResponse(keyName, - tenantConfigurationManagement.getConfigurationValue(keyName))); + LOG.debug("{} config value deleted, return status {}", keyName, HttpStatus.OK); + return ResponseEntity.ok().build(); } @Override public ResponseEntity updateTenantConfigurationValue( @PathVariable("keyName") final String keyName, @RequestBody final MgmtSystemTenantConfigurationValueRequest configurationValueRest) { - - final TenantConfigurationValue updatedValue = tenantConfigurationManagement + Serializable configurationValue = configurationValueRest.getValue(); + final MgmtSystemTenantConfigurationValue responseUpdatedValue; + if (isDefaultDistributionSetTypeKey(keyName)) { + responseUpdatedValue = updateDefaultDsType(configurationValue); + } else { + final TenantConfigurationValue updatedTenantConfigurationValue = tenantConfigurationManagement .addOrUpdateConfiguration(keyName, configurationValueRest.getValue()); - return ResponseEntity.ok(MgmtTenantManagementMapper.toResponse(keyName, updatedValue)); + responseUpdatedValue = MgmtTenantManagementMapper.toResponseTenantConfigurationValue(keyName, updatedTenantConfigurationValue); + } + + return ResponseEntity.ok(responseUpdatedValue); } @Override @@ -89,11 +125,48 @@ public ResponseEntity> updateTenantConf return ResponseEntity.badRequest().build(); } - Map> tenantConfigurationValues = tenantConfigurationManagement - .addOrUpdateConfiguration(configurationValueMap); + //Try update TenantMetadata first + Serializable defaultDsTypeValueUpdate = configurationValueMap.remove(MgmtTenantManagementMapper.DEFAULT_DISTRIBUTION_SET_TYPE_KEY); + Long oldDefaultDsType = null; + MgmtSystemTenantConfigurationValue updatedDefaultDsType = null; + if (defaultDsTypeValueUpdate != null) { + oldDefaultDsType = systemManagement.getTenantMetadata().getDefaultDsType().getId(); + updatedDefaultDsType = updateDefaultDsType(defaultDsTypeValueUpdate); + } + //try update TenantConfiguration, in case of Error -> rollback TenantMetadata + Map> tenantConfigurationValues; + try { + tenantConfigurationValues = tenantConfigurationManagement.addOrUpdateConfiguration(configurationValueMap); + } catch (Exception ex) { + //if DefaultDsType was updated, rollback it in case of TenantConfiguration update. + if (updatedDefaultDsType != null) { + systemManagement.updateTenantMetadata(oldDefaultDsType); + } + throw ex; + } + + List tenantConfigurationListUpdated = new java.util.ArrayList<>(tenantConfigurationValues.entrySet().stream() + .map(entry -> MgmtTenantManagementMapper.toResponseTenantConfigurationValue(entry.getKey(), entry.getValue())).toList()); + if (updatedDefaultDsType != null) { + tenantConfigurationListUpdated.add(updatedDefaultDsType); + } + - return ResponseEntity.ok(tenantConfigurationValues.entrySet().stream().map(entry -> - MgmtTenantManagementMapper.toResponse(entry.getKey(), entry.getValue())).toList()); + return ResponseEntity.ok(tenantConfigurationListUpdated); + } + private MgmtSystemTenantConfigurationValue updateDefaultDsType(Serializable defaultDsType) { + long updateDefaultDsType; + try { + updateDefaultDsType = ((Number) defaultDsType).longValue(); + } catch (ClassCastException cce) { + throw new TenantConfigurationValidatorException(String.format( + "Default DistributionSetType Value Type is incorrect. Expected Long, received %s", defaultDsType.getClass().getName())); + } + systemManagement.updateTenantMetadata(updateDefaultDsType); + return MgmtTenantManagementMapper.toResponseDefaultDsType(updateDefaultDsType); } + private static boolean isDefaultDistributionSetTypeKey(String keyName) { + return MgmtTenantManagementMapper.DEFAULT_DISTRIBUTION_SET_TYPE_KEY.equals(keyName); + } } diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/PagingUtility.java b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/PagingUtility.java index 305995c445..b93709788b 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/PagingUtility.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/java/org/eclipse/hawkbit/mgmt/rest/resource/PagingUtility.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/main/resources/hawkbit-mgmt-api-defaults.properties b/hawkbit-rest/hawkbit-mgmt-resource/src/main/resources/hawkbit-mgmt-api-defaults.properties index 5080301e56..9740133a44 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/main/resources/hawkbit-mgmt-api-defaults.properties +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/main/resources/hawkbit-mgmt-api-defaults.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2018 Microsoft and others. +# Copyright (c) 2018 Microsoft and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Upload of large files diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/AbstractManagementApiIntegrationTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/AbstractManagementApiIntegrationTest.java index ce2ee12ef4..f8ed7f891b 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/AbstractManagementApiIntegrationTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/AbstractManagementApiIntegrationTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtActionResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtActionResourceTest.java index cefeea44e4..a8629328bf 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtActionResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtActionResourceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -341,6 +342,28 @@ void getActionsWithEmptyResult() throws Exception { .andExpect(jsonPath("content", hasSize(0))).andExpect(jsonPath("total", equalTo(0))); } + @Test + @Description("Handles the GET request of retrieving a specific action.") + public void getAction() throws Exception { + final String knownTargetId = "targetId"; + // prepare ds + final DistributionSet ds = testdataFactory.createDistributionSet(); + // rollout + final Target target = testdataFactory.createTarget(knownTargetId); + final Rollout rollout = testdataFactory.createRolloutByVariables("TestRollout", "TestDesc", 1, + "name==" + target.getName(), ds, "50", "5"); + rolloutManagement.start(rollout.getId()); + rolloutHandler.handleAll(); + + final List actions = deploymentManagement.findActionsByTarget(target.getControllerId(), PAGE) + .getContent(); + assertThat(actions).hasSize(1); + + mvc.perform(get(MgmtRestConstants.ACTION_V1_REQUEST_MAPPING + "/{actionId}", actions.get(0).getId())) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + } + @Test @Description("Verifies paging is respected as expected.") void getMultipleActionsWithPagingLimitRequestParameter() throws Exception { @@ -483,5 +506,4 @@ private static String generateDistributionSetLink(final Action action) { return "http://localhost" + MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/" + action.getDistributionSet().getId(); } - } diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtBasicAuthResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtBasicAuthResourceTest.java index 0b952a2714..8fdc4c36d8 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtBasicAuthResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtBasicAuthResourceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtContentTypeTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtContentTypeTest.java index 0f43c22a16..a6b11ab02c 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtContentTypeTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtContentTypeTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResourceTest.java index b1fa4f952c..92b33b1cbb 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetResourceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -64,6 +65,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.springframework.data.domain.PageRequest; +import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.MvcResult; @@ -77,15 +79,13 @@ import io.qameta.allure.Story; import org.springframework.util.Assert; -import javax.validation.constraints.AssertTrue; - @Feature("Component Tests - Management API") @Story("Distribution Set Resource") public class MgmtDistributionSetResourceTest extends AbstractManagementApiIntegrationTest { @Test - @Description("This test verifies the call of all Software Modules that are assiged to a Distribution Set through the RESTful API.") - public void getSoftwaremodules() throws Exception { + @Description("This test verifies the call of all Software Modules that are assigned to a Distribution Set through the RESTful API.") + public void getSoftwareModules() throws Exception { // Create DistributionSet with three software modules final DistributionSet set = testdataFactory.createDistributionSet("SMTest"); mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/" + set.getId() + "/assignedSM")) @@ -93,6 +93,18 @@ public void getSoftwaremodules() throws Exception { .andExpect(jsonPath("$.size", equalTo(set.getModules().size()))); } + @Test + @Description("Handles the GET request of retrieving assigned software modules of a single distribution set within SP with given page size and offset including sorting by version descending and filter down to all sets which name starts with 'one'.") + public void getSoftwareModulesWithParameters() throws Exception { + final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); + + // post assignment + mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/" + set.getId() + "/assignedSM") + .param("offset", "1").param("limit", "2").param("sort", "version:DESC").param("q", "name==one*") + .accept(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)); + } + @Test @Description("This test verifies the deletion of a assigned Software Module of a Distribution Set can not be achieved when that Distribution Set has been assigned or installed to a target.") public void deleteFailureWhenDistributionSetInUse() throws Exception { @@ -179,7 +191,7 @@ public void assignmentFailureWhenAssigningToUsedDistributionSet() throws Excepti @Test @Description("This test verifies the assignment of Software Modules to a Distribution Set through the RESTful API.") - public void assignSoftwaremoduleToDistributionSet() throws Exception { + public void assignSoftwareModuleToDistributionSet() throws Exception { // create DisSet final DistributionSet disSet = testdataFactory.createDistributionSetWithNoSoftwareModules("Jupiter", "398,88"); @@ -242,7 +254,7 @@ public void assignSoftwaremoduleToDistributionSet() throws Exception { @Test @Description("This test verifies the removal of Software Modules of a Distribution Set through the RESTful API.") - public void unassignSoftwaremoduleFromDistributionSet() throws Exception { + public void unassignSoftwareModuleFromDistributionSet() throws Exception { // Create DistributionSet with three software modules final DistributionSet set = testdataFactory.createDistributionSet("Venus"); @@ -578,12 +590,28 @@ public void getAssignedTargetsOfDistributionSet() throws Exception { testdataFactory.createTarget(knownTargetId); assignDistributionSet(createdDs.getId(), knownTargetId); - mvc.perform(get( - MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/" + createdDs.getId() + "/assignedTargets")) + mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/" + createdDs.getId() + "/assignedTargets")) .andExpect(status().isOk()).andExpect(jsonPath("$.size", equalTo(1))) .andExpect(jsonPath("$.content[0].controllerId", equalTo(knownTargetId))); } + @Test + @Description("Handles the GET request for retrieving assigned targets of a single distribution set with a defined page size and offset, sorted by name in descending order and filtered down to all targets which controllerID starts with 'target'.") + public void getAssignedTargetsOfDistributionSetWithParameters() throws Exception { + final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); + + assignDistributionSet(set, testdataFactory.createTargets(5, "targetMisc", "Test targets for query")) + .getAssignedEntity(); + + mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/" + set.getId() + "/assignedTargets") + .param("offset", "1").param("limit", "2").param("sort", "name:DESC") + .param("q", "controllerId==target*").accept(MediaType.APPLICATION_JSON)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)); + + } + @Test @Description("Ensures that assigned targets of DS are returned as persisted in the repository.") public void getAssignedTargetsOfDistributionSetIsEmpty() throws Exception { @@ -616,6 +644,24 @@ public void getInstalledTargetsOfDistributionSet() throws Exception { .andExpect(jsonPath("$.content[0].controllerId", equalTo(knownTargetId))); } + @Test + @Description("Handles the GET request for retrieving installed targets of a single distribution set with a defined page size and offset, sortet by name in descending order and filtered down to all targets which controllerID starts with 'target'.") + public void getInstalledTargetsOfDistributionSetWithParameters() throws Exception { + final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); + + final List targets = assignDistributionSet(set, + testdataFactory.createTargets(5, "targetMisc", "Test targets for query")).getAssignedEntity().stream() + .map(Action::getTarget).collect(Collectors.toList()); + testdataFactory.sendUpdateActionStatusToTargets(targets, Status.FINISHED, "some message"); + + mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/" + set.getId() + "/installedTargets") + .param("offset", "1").param("limit", "2").param("sort", "name:DESC") + .param("q", "controllerId==target*").accept(MediaType.APPLICATION_JSON)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)); + } + @Test @Description("Ensures that target filters with auto assign DS are returned as persisted in the repository.") public void getAutoAssignTargetFiltersOfDistributionSet() throws Exception { @@ -635,6 +681,22 @@ public void getAutoAssignTargetFiltersOfDistributionSet() throws Exception { .andExpect(jsonPath("$.content[0].name", equalTo(knownFilterName))); } + @Test + @Description("Handles the GET request for retrieving assigned target filter queries of a single distribution set with a defined page size and offset, sorted by name in descending order and filtered down to all targets with a name that ends with '1'.") + public void ggetAutoAssignTargetFiltersOfDistributionSetWithParameters() throws Exception { + final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); + targetFilterQueryManagement.create(entityFactory.targetFilterQuery().create().name("filter1").query("name==a") + .autoAssignDistributionSet(set)); + + mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/" + set.getId() + "/autoAssignTargetFilters") + .param("offset", "1").param("limit", "2").param("sort", "name:DESC").param("q", "name==*1") + .accept(MediaType.APPLICATION_JSON)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON)); + + } + @Test @Description("Ensures that an error is returned when the query is invalid.") public void getAutoAssignTargetFiltersOfDSWithInvalidFilter() throws Exception { @@ -692,7 +754,7 @@ private void prepareTestFilters(final String filterNamePrefix, final Distributio @Test @Description("Ensures that DS in repository are listed with proper paging properties.") - public void getDistributionSetsWithoutAddtionalRequestParameters() throws Exception { + public void getDistributionSetsWithoutAdditionalRequestParameters() throws Exception { final int sets = 5; createDistributionSetsAlphabetical(sets); mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING)).andDo(MockMvcResultPrinter.print()) @@ -1184,8 +1246,8 @@ public void deleteMetadataThatDoesNotExistLeadsToNotFound() throws Exception { } @Test - @Description("Ensures that a metadata entry selection through API reflectes the repository content.") - public void getSingleMetadata() throws Exception { + @Description("Ensures that a metadata entry selection through API reflects the repository content.") + public void geteMetadataKey() throws Exception { // prepare and create metadata final String knownKey = "knownKey"; final String knownValue = "knownValue"; @@ -1197,9 +1259,28 @@ public void getSingleMetadata() throws Exception { .andExpect(jsonPath("key", equalTo(knownKey))).andExpect(jsonPath("value", equalTo(knownValue))); } + @Test + @Description("Get a paged list of meta data for a distribution set with standard page size.") + public void getMetadata() throws Exception { + final int totalMetadata = 4; + final String knownKeyPrefix = "knownKey"; + final String knownValuePrefix = "knownValue"; + final DistributionSet testDS = testdataFactory.createDistributionSet("one"); + for (int index = 0; index < totalMetadata; index++) { + distributionSetManagement.createMetaData(testDS.getId(), Lists + .newArrayList(entityFactory.generateDsMetadata(knownKeyPrefix + index, knownValuePrefix + index))); + } + + mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/metadata", + testDS.getId())) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaTypes.HAL_JSON)); + } + @Test @Description("Ensures that a metadata entry paged list selection through API reflectes the repository content.") - public void getPagedListofMetadata() throws Exception { + public void getPagedListOfMetadata() throws Exception { final int totalMetadata = 10; final int limitParam = 5; @@ -1366,7 +1447,7 @@ private static Stream confirmationOptions() { @Test @Description("A request for assigning a target multiple times results in a Bad Request when multiassignment is disabled.") - public void multiassignmentRequestNotAllowedIfDisabled() throws Exception { + public void multiAssignmentRequestNotAllowedIfDisabled() throws Exception { final String targetId = testdataFactory.createTarget().getControllerId(); final Long dsId = testdataFactory.createDistributionSet().getId(); diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResourceTest.java index e136d606f8..9aed802683 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTagResourceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -74,7 +75,19 @@ public void getDistributionSetTags() throws Exception { } @Test - @Description("Verfies that a paged result list of DS tags reflects the content on the repository side when filtered by distribution set id.") + @Description("Handles the GET request of retrieving all distribution set tags based by parameter") + public void getDistributionSetTagsWithParameters() throws Exception { + final List tags = testdataFactory.createDistributionSetTags(2); + final DistributionSetTag assigned = tags.get(0); + final DistributionSetTag unassigned = tags.get(1); + mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING + + "?limit=10&sort=name:ASC&offset=0&q=name==DsTag")) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + } + + @Test + @Description("Verifies that a paged result list of DS tags reflects the content on the repository side when filtered by distribution set id.") public void getDistributionSetTagsByDistributionSetId() throws Exception { final List tags = testdataFactory.createDistributionSetTags(2); final DistributionSetTag tag1 = tags.get(0); diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResourceTest.java index e9ccdf258f..b9302a36c2 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDistributionSetTypeResourceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -431,6 +432,15 @@ public void getDistributionSetType() throws Exception { .andExpect(jsonPath("$.deleted", equalTo(testType.isDeleted()))); } + @Test + @Description("Handles the GET request of retrieving all distribution set types within SP based on parameter.") + public void getDistributionSetTypesWithParameter() throws Exception { + mvc.perform(get(MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + + "?limit=10&sort=name:ASC&offset=0&q=name==a")) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + } + @Test @WithUser(principal = "uploadTester", allSpPermissions = true) @Description("Checks the correct behaviour of /rest/v1/DistributionSetTypes/{ID} DELETE requests (hard delete scenario).") @@ -497,6 +507,22 @@ public void updateDistributionSetTypeColourDescriptionAndNameUntouched() throws .andExpect(jsonPath("$.name", equalTo("TestName123"))).andReturn(); } + @Test + @Description("Handles the PUT request for a single distribution set type within SP.") + public void updateDistributionSetTypeDescriptionAndColor() throws Exception { + final DistributionSetType testType = distributionSetTypeManagement.update(entityFactory.distributionSetType() + .update(testdataFactory.createDistributionSet().getType().getId()).description("Desc1234")); + final String body = new JSONObject() + .put("description", "an updated description") + .put("colour", "rgb(106,178,83)").toString(); + + mvc + .perform(put(MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}", + testType.getId()).content(body).contentType(MediaType.APPLICATION_JSON)) + .andDo(MockMvcResultPrinter.print()); + + } + @Test @Description("Tests the update of the deletion flag. It is verfied that the distribution set type can't be marked as deleted through update operation.") public void updateDistributionSetTypeDeletedFlag() throws Exception { diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadResourceTest.java index 5e61b24f94..833808c5f0 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtDownloadResourceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResourceTest.java index c6161ae693..fea2fb06b2 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtRolloutResourceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -24,6 +25,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import java.time.Duration; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.NoSuchElementException; @@ -33,6 +35,7 @@ import org.awaitility.Awaitility; import org.eclipse.hawkbit.exception.SpServerError; +import org.eclipse.hawkbit.im.authentication.SpPermission; import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; import org.eclipse.hawkbit.repository.RolloutGroupManagement; import org.eclipse.hawkbit.repository.RolloutManagement; @@ -53,6 +56,7 @@ import org.eclipse.hawkbit.repository.test.util.WithUser; import org.eclipse.hawkbit.rest.util.JsonBuilder; import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -61,6 +65,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort.Direction; +import org.springframework.hateoas.MediaTypes; import org.springframework.http.MediaType; import org.springframework.test.web.servlet.ResultMatcher; @@ -378,6 +383,41 @@ void retrieveRolloutListFullRepresentationWithFilter() throws Exception { .andExpect(jsonPath("content[0]._links.self.href", startsWith(HREF_ROLLOUT_PREFIX))); } + @Test + @Description("Handles the GET request of retrieving a single rollout.") + public void getRollout() throws Exception { + enableMultiAssignments(); + approvalStrategy.setApprovalNeeded(true); + try { + approvalStrategy.setApproveDecidedBy("exampleUsername"); + + testdataFactory.createTargets(4, "rollout", "description"); + final DistributionSet dsA = testdataFactory.createDistributionSet(""); + // create a running rollout for the created targets + final Rollout rollout = rolloutManagement.create( + entityFactory + .rollout() + .create() + .name("rollout1") + .set(dsA.getId()) + .targetFilterQuery("controllerId==rollout*"), + 4, false, new RolloutGroupConditionBuilder().withDefaults() + .successCondition(RolloutGroupSuccessCondition.THRESHOLD, "100").build()); + + rolloutHandler.handleAll(); + + rolloutManagement.approveOrDeny(rollout.getId(), Rollout.ApprovalDecision.APPROVED, "Approved remark."); + + mvc.perform(get(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}", rollout.getId()) + .accept(MediaTypes.HAL_JSON_VALUE)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaTypes.HAL_JSON)); + } finally { + approvalStrategy.setApprovalNeeded(false); + } + } + @ParameterizedTest @ValueSource(booleans = { true, false }) @Description("Verify the confirmation required flag is not part of the rollout parent entity") @@ -1070,6 +1110,24 @@ void retrieveTargetsFromRolloutGroup() throws Exception { .andExpect(jsonPath("$.content", hasSize(5))).andExpect(jsonPath("$.total", equalTo(5))); } + @Test + @Description("Handles the GET request of retrieving a all targets of a specific deploy group of a rollout.") + public void getRolloutDeployGroupTargetsWithParameters() throws Exception { + testdataFactory.createTargets(4, "rollout", "description"); + final DistributionSet dsA = testdataFactory.createDistributionSet(""); + final Rollout rollout = createRollout("rollout1", 2, dsA.getId(), "controllerId==rollout*"); + final RolloutGroup firstRolloutGroup = rolloutGroupManagement + .findByRollout(PageRequest.of(0, 1), rollout.getId()).getContent().get(0); + + mvc.perform(get(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/deploygroups/{deployGroupId}/targets", + rollout.getId(), firstRolloutGroup.getId()).param("offset", "0").param("limit", "2") + .param("sort", "name:ASC").param("q", "controllerId==exampleTarget0") + .accept(MediaTypes.HAL_JSON_VALUE)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaTypes.HAL_JSON)); + } + @Test @Description("Testing that the targets of rollout group can be retrieved with rsql query param") void retrieveTargetsFromRolloutGroupWithQuery() throws Exception { @@ -1336,6 +1394,40 @@ void weightValidation() throws Exception { assertThat(rollouts.get(0).getWeight()).get().isEqualTo(weight); } + @Test + @Description("Handles the POST request of approving a rollout.") + public void approveRollout() throws Exception { + approvalStrategy.setApprovalNeeded(true); + try { + testdataFactory.createTargets(4, "rollout", "description"); + final DistributionSet dsA = testdataFactory.createDistributionSet(""); + final Rollout rollout = createRollout("rollout1", 3, dsA.getId(), "controllerId==rollout*", false); + mvc.perform(post(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/approve", rollout.getId()) + .accept(MediaTypes.HAL_JSON_VALUE)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + } finally { + approvalStrategy.setApprovalNeeded(false); + } + } + + @Test + @Description("Handles the POST request of denying a rollout. Required Permission: " + SpPermission.APPROVE_ROLLOUT) + public void denyRollout() throws Exception { + approvalStrategy.setApprovalNeeded(true); + try { + testdataFactory.createTargets(4, "rollout", "description"); + final DistributionSet dsA = testdataFactory.createDistributionSet(""); + final Rollout rollout = createRollout("rollout1", 3, dsA.getId(), "controllerId==rollout*", false); + mvc.perform(post(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/deny", rollout.getId()) + .accept(MediaTypes.HAL_JSON_VALUE)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + } finally { + approvalStrategy.setApprovalNeeded(false); + } + } + @Test @Description("Check if approvalDecidedBy and approvalRemark are present when rollout is approved") public void validateIfApprovalFieldsArePresentAfterApproval() throws Exception { @@ -1487,6 +1579,99 @@ void triggeringNextGroupRolloutWrongState() throws Exception { } + @Test + @Description("Retry rollout test scenario") + public void retryRolloutTest() throws Exception { + + final DistributionSet dsA = testdataFactory.createDistributionSet(""); + final List successTargets = testdataFactory.createTargets("retryRolloutTargetSuccess-", 6); + final List failedTargets = testdataFactory.createTargets("retryRolloutTargetFailed-", 4); + + final List allTargets = new ArrayList<>(successTargets); + allTargets.addAll(failedTargets); + + postRollout("rolloutToBeRetried", 1, dsA.getId(), "id==retryRolloutTarget*", 10, Action.ActionType.FORCED); + + Rollout rollout = rolloutManagement.getByName("rolloutToBeRetried").orElseThrow(); + + // no scheduler so invoke here + rolloutHandler.handleAll(); + rolloutManagement.start(rollout.getId()); + // no scheduler so invoke here + rolloutHandler.handleAll(); + + + testdataFactory.sendUpdateActionStatusToTargets(successTargets, Status.FINISHED, "Finished successfully!"); + testdataFactory.sendUpdateActionStatusToTargets(failedTargets, Status.ERROR, "Finished error!"); + + rolloutHandler.handleAll(); + + for (Target target : allTargets) { + final List actions = deploymentManagement.findActionsByTarget(target.getControllerId(), PAGE).getContent(); + for (Action action : actions) { + if (action.getTarget().getControllerId().startsWith("retryRolloutTargetFailed")) { + Assertions.assertEquals(Status.ERROR, action.getStatus()); + } else { + Assertions.assertEquals(Status.FINISHED, action.getStatus()); + } + Assertions.assertEquals(rollout.getId(), action.getRollout().getId()); + } + } + + //retry rollout + mvc.perform(post("/rest/v1/rollouts/{rolloutId}/retry", rollout.getId())).andDo(MockMvcResultPrinter.print()) + .andExpect(status().is(201)); + + //search for _retried suffix + Rollout retriedRollout = rolloutManagement.getByName(rollout.getName() + "_retry").orElseThrow(); + //assert 4 targets involved + rolloutHandler.handleAll(); + + rolloutManagement.start(retriedRollout.getId()); + rolloutHandler.handleAll(); + + for (Target target : failedTargets) { + // for failed targets - check for 2 actions - one from old rollout and one from the retried + List actions = deploymentManagement.findActionsByTarget(target.getControllerId(), PAGE).getContent(); + Assertions.assertEquals(2, actions.size()); + Assertions.assertEquals(Status.ERROR, actions.get(0).getStatus()); + Assertions.assertEquals(rollout.getId(), actions.get(0).getRollout().getId()); + Assertions.assertEquals(Status.RUNNING, actions.get(1).getStatus()); + Assertions.assertEquals(retriedRollout.getId(), actions.get(1).getRollout().getId()); + } + + for (Target target : successTargets) { + //ensure no other actions from the success targets are created + List actions = deploymentManagement.findActionsByTarget(target.getControllerId(), PAGE).getContent(); + Assertions.assertEquals(1, actions.size()); + Assertions.assertEquals(rollout.getId(), actions.get(0).getRollout().getId()); + } + } + + @Test + @Description("Retrying a running rollout should not be allowed.") + public void retryNotFinishedRolloutShouldNotBeAllowed() throws Exception { + final DistributionSet dsA = testdataFactory.createDistributionSet(""); + testdataFactory.createTargets("retryRolloutTarget-", 10); + postRollout("rolloutToBeRetried", 1, dsA.getId(), "id==retryRolloutTarget*", 10, Action.ActionType.FORCED); + Rollout rollout = rolloutManagement.getByName("rolloutToBeRetried").orElseThrow(); + // no scheduler so invoke here + rolloutHandler.handleAll(); + rolloutManagement.start(rollout.getId()); + // no scheduler so invoke here + rolloutHandler.handleAll(); + + mvc.perform(post("/rest/v1/rollouts/{rolloutId}/retry", rollout.getId())).andDo(MockMvcResultPrinter.print()) + .andExpect(status().isBadRequest()); + } + + @Test + @Description("Retrying a non-existing rollout should lead to NOT FOUND.") + public void retryNonExistingRolloutShouldLeadToNotFound() throws Exception { + mvc.perform(post("/rest/v1/rollouts/{rolloutId}/retry", 6782623)).andDo(MockMvcResultPrinter.print()) + .andExpect(status().isNotFound()); + } + private void triggerNextGroupAndExpect(final Rollout rollout, final ResultMatcher expect) throws Exception { mvc.perform(post("/rest/v1/rollouts/{rolloutId}/triggerNextGroup", rollout.getId())) .andDo(MockMvcResultPrinter.print()).andExpect(expect); @@ -1506,6 +1691,10 @@ private void retrieveAndCompareRolloutsContent(final DistributionSet dsA, final retrieveAndCompareRolloutsContent(dsA, urlTemplate, isFullRepresentation, false, null, null); } + private Rollout getRollout(final long rolloutId) { + return rolloutManagement.get(rolloutId).orElseThrow(NoSuchElementException::new); + } + private void retrieveAndCompareRolloutsContent(final DistributionSet dsA, final String urlTemplate, final boolean isFullRepresentation, final boolean isStartTypeScheduled, final Long startAt, final Long forcetime) throws Exception { diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResourceTest.java index 234df13101..b0ab7ddd7e 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleResourceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -689,6 +690,24 @@ void getArtifacts() throws Exception { "http://localhost/rest/v1/softwaremodules/" + sm.getId() + "/artifacts/" + artifact2.getId()))); } + @Test + @Description("Handles the GET request of retrieving all meta data of artifacts assigned to a software module (in full representation mode including a download URL by the artifact provider).") + public void getArtifactsWithParameters() throws Exception { + final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); + + final byte[] random = RandomStringUtils.random(5).getBytes(); + + artifactManagement.create(new ArtifactUpload(new ByteArrayInputStream(random), sm.getId(), "file1", false, 0)); + + mvc.perform( + get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/artifacts", sm.getId()) + .param("representation", MgmtRepresentationMode.FULL.toString()) + .param("useartifacturlhandler", Boolean.TRUE.toString())) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaTypes.HAL_JSON)); + } + @ParameterizedTest @ValueSource(booleans = { true, false }) @Description("Verifies the listing of all artifacts assigned to a software module. That includes the artifact metadata and download links.") @@ -782,9 +801,43 @@ void invalidRequestsOnArtifactResource() throws Exception { artifactSoftDeleted.getId())).andDo(MockMvcResultPrinter.print()).andExpect(status().isGone()); } + @Test + @Description("Tests the deletion of an artifact including verification that the artifact is actually erased in the repository and removed from the software module.") + void deleteArtifact() throws Exception { + // Create 1 SM + final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); + + final int artifactSize = 5 * 1024; + final byte random[] = RandomStringUtils.random(artifactSize).getBytes(); + + // Create 2 artifacts + final Artifact artifact = artifactManagement.create( + new ArtifactUpload(new ByteArrayInputStream(random), sm.getId(), "file1", false, artifactSize)); + artifactManagement.create( + new ArtifactUpload(new ByteArrayInputStream(random), sm.getId(), "file2", false, artifactSize)); + + // check repo before delete + assertThat(softwareModuleManagement.findAll(PAGE)).hasSize(1); + + assertThat(softwareModuleManagement.get(sm.getId()).get().getArtifacts()).hasSize(2); + assertThat(artifactManagement.count()).isEqualTo(2); + + // delete + mvc.perform(delete("/rest/v1/softwaremodules/{smId}/artifacts/{artId}", sm.getId(), artifact.getId())) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + + // check that only one artifact is still alive and still assigned + assertThat(softwareModuleManagement.findAll(PAGE)).as("After the sm should be marked as deleted").hasSize(1); + assertThat(artifactManagement.count()).isEqualTo(1); + assertThat(softwareModuleManagement.get(sm.getId()).get().getArtifacts()) + .as("After delete artifact should available for marked as deleted sm's").hasSize(1); + + } + @Test @Description("Verifies that the system refuses unsupported request types and answers as defined to them, e.g. NOT FOUND on a non existing resource. Or a HTTP POST for updating a resource results in METHOD NOT ALLOWED etc.") - void invalidRequestsOnSoftwaremodulesResource() throws Exception { + void invalidRequestsOnSoftwareModulesResource() throws Exception { final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); final List modules = Arrays.asList(sm); @@ -843,7 +896,7 @@ void invalidRequestsOnSoftwaremodulesResource() throws Exception { @Test @Description("Test of modules retrieval without any parameters. Will return all modules in the system as defined by standard page size.") - void getSoftwareModulesWithoutAddtionalRequestParameters() throws Exception { + void getSoftwareModulesWithoutAdditionalRequestParameters() throws Exception { final int modules = 5; createSoftwareModulesAlphabetical(modules); mvc.perform(get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING)) @@ -1153,40 +1206,6 @@ void deleteAssignedSoftwareModule() throws Exception { assertThat(artifactManagement.count()).isEqualTo(1); } - @Test - @Description("Tests the deletion of an artifact including verification that the artifact is actually erased in the repository and removed from the software module.") - void deleteArtifact() throws Exception { - // Create 1 SM - final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); - - final int artifactSize = 5 * 1024; - final byte random[] = RandomStringUtils.random(artifactSize).getBytes(); - - // Create 2 artifacts - final Artifact artifact = artifactManagement.create( - new ArtifactUpload(new ByteArrayInputStream(random), sm.getId(), "file1", false, artifactSize)); - artifactManagement.create( - new ArtifactUpload(new ByteArrayInputStream(random), sm.getId(), "file2", false, artifactSize)); - - // check repo before delete - assertThat(softwareModuleManagement.findAll(PAGE)).hasSize(1); - - assertThat(softwareModuleManagement.get(sm.getId()).get().getArtifacts()).hasSize(2); - assertThat(artifactManagement.count()).isEqualTo(2); - - // delete - mvc.perform(delete("/rest/v1/softwaremodules/{smId}/artifacts/{artId}", sm.getId(), artifact.getId())) - .andDo(MockMvcResultPrinter.print()) - .andExpect(status().isOk()); - - // check that only one artifact is still alive and still assigned - assertThat(softwareModuleManagement.findAll(PAGE)).as("After the sm should be marked as deleted").hasSize(1); - assertThat(artifactManagement.count()).isEqualTo(1); - assertThat(softwareModuleManagement.get(sm.getId()).get().getArtifacts()) - .as("After delete artifact should available for marked as deleted sm's").hasSize(1); - - } - @Test @Description("Verifies the successful creation of metadata and the enforcement of the meta data quota.") void createMetadata() throws Exception { @@ -1238,9 +1257,67 @@ void createMetadata() throws Exception { } + @Test + @Description(" Get a paged list of meta data for a software module.") + public void getMetadata() throws Exception { + final int totalMetadata = 4; + final String knownKeyPrefix = "knownKey"; + final String knownValuePrefix = "knownValue"; + final SoftwareModule module = testdataFactory.createDistributionSet("one").findFirstModuleByType(osType).get(); + + for (int index = 0; index < totalMetadata; index++) { + softwareModuleManagement.createMetaData(entityFactory.softwareModuleMetadata().create(module.getId()) + .key(knownKeyPrefix + index).value(knownValuePrefix + index)); + } + + mvc.perform(get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/metadata", + module.getId())).andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaTypes.HAL_JSON)); + } + + @Test + @Description(" Get a paged list of meta data for a software module with defined page size and sorting by name descending and key starting with 'known'.") + public void getMetadataWithParameters() throws Exception { + final int totalMetadata = 4; + final String knownKeyPrefix = "knownKey"; + final String knownValuePrefix = "knownValue"; + final SoftwareModule module = testdataFactory.createDistributionSet("one").findFirstModuleByType(osType).get(); + + for (int index = 0; index < totalMetadata; index++) { + softwareModuleManagement.createMetaData(entityFactory.softwareModuleMetadata().create(module.getId()) + .key(knownKeyPrefix + index).value(knownValuePrefix + index)); + } + + mvc.perform(get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/metadata", + module.getId()).param("offset", "1").param("limit", "2").param("sort", "key:DESC").param("q", + "key==known*")) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaTypes.HAL_JSON)); + } + + @Test + @Description(" Get a single meta data value for a meta data key." ) + public void getMetadataValue() throws Exception { + + // prepare and create metadata + final String knownKey = "knownKey"; + final String knownValue = "knownValue"; + final SoftwareModule module = testdataFactory.createDistributionSet("one").findFirstModuleByType(osType).get(); + softwareModuleManagement.createMetaData( + entityFactory.softwareModuleMetadata().create(module.getId()).key(knownKey).value(knownValue)); + + mvc.perform( + get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/metadata/{metadataKey}", + module.getId(), knownKey)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + } + @Test @Description("Verifies the successful update of metadata based on given key.") - void updateMetadata() throws Exception { + void updateMetadataKey() throws Exception { // prepare and create metadata for update final String knownKey = "knownKey"; final String knownValue = "knownValue"; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResourceTest.java index f4487f327b..3781687ed9 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtSoftwareModuleTypeResourceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -94,6 +95,20 @@ public void getSoftwareModuleTypes() throws Exception { .andExpect(jsonPath("$.total", equalTo(4))); } + @Test + @WithUser(principal = "uploadTester", allSpPermissions = true) + @Description("Handles the GET request of retrieving all software module types within SP with parameters. In this case the first 10 result in ascending order by name where the name starts with 'a'.") + public void getSoftwareModuleTypesWithParameters() throws Exception { + final SoftwareModuleType testType = testdataFactory.findOrCreateSoftwareModuleType("test123"); + softwareModuleTypeManagement + .update(entityFactory.softwareModuleType().update(testType.getId()).description("Desc1234").colour("rgb(106,178,83)")); + + mvc.perform(get(MgmtRestConstants.SOFTWAREMODULETYPE_V1_REQUEST_MAPPING + "?limit=10&sort=name:ASC&offset=0&q=name==a") + .accept(MediaType.APPLICATION_JSON)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + } + private SoftwareModuleType createTestType() { SoftwareModuleType testType = softwareModuleTypeManagement.create(entityFactory.softwareModuleType().create() .key("test123").name("TestName123").description("Desc123").colour("colour").maxAssignments(5)); diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResourceTest.java index 41b90f244b..1226b1638a 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetFilterQueryResourceTest.java @@ -1,16 +1,18 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.hawkbit.rest.util.MockMvcResultPrinter.print; import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.hasSize; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; @@ -20,6 +22,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.stream.Stream; @@ -36,7 +39,9 @@ import org.eclipse.hawkbit.repository.model.TargetFilterQuery; import org.eclipse.hawkbit.rest.exception.MessageNotReadableException; import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; +import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; import org.json.JSONObject; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -49,6 +54,7 @@ import io.qameta.allure.Feature; import io.qameta.allure.Step; import io.qameta.allure.Story; +import org.springframework.web.util.UriUtils; /** * Spring MVC Tests against the MgmtTargetResource. @@ -56,7 +62,7 @@ */ @Feature("Component Tests - Management API") @Story("Target Filter Query Resource") -public class MgmtTargetFilterQueryResourceTest extends AbstractManagementApiIntegrationTest { +public class MgmtTargetFilterQueryResourceTest extends AbstractManagementApiIntegrationTest { private static final String JSON_PATH_ROOT = "$"; @@ -90,6 +96,39 @@ public class MgmtTargetFilterQueryResourceTest extends AbstractManagementApiInte private static final String JSON_PATH_EXCEPTION_CLASS = JSON_PATH_ROOT + JSON_PATH_FIELD_EXCEPTION_CLASS; private static final String JSON_PATH_ERROR_CODE = JSON_PATH_ROOT + JSON_PATH_FIELD_ERROR_CODE; + @Test + @Description("Handles the GET request of retrieving all target filter queries within SP.") + public void getTargetFilterQueries() throws Exception { + final String filterName = "filter_01"; + final TargetFilterQuery filterQuery = createSingleTargetFilterQuery(filterName, "name==test_01"); + + mvc.perform(get(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING)) + .andExpect(status().isOk()) + .andDo(MockMvcResultPrinter.print()); + } + + @Test + @Description("Handles the GET request of retrieving all target filter queries within SP based by parameter. Required Permission: READ_TARGET.") + public void getTargetFilterQueriesWithParameters() throws Exception { + mvc.perform(get(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "?limit=10&sort=name:ASC&offset=0&q=name==*1")) + .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()); + } + + @Test + @Description("Handles the POST request of creating a new target filter query within SP.") + public void createTargetFilterQuery() throws Exception { + final String name = "test_02"; + final String filterQuery = "name==test_02"; + final String body = new JSONObject() + .put("name", name) + .put("query", filterQuery).toString(); + + mvc.perform(post(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING) + .contentType(MediaType.APPLICATION_JSON).content(body)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isCreated()); + } + @Test @Description("Ensures that deletion is executed if permitted.") public void deleteTargetFilterQueryReturnsOK() throws Exception { @@ -220,6 +259,47 @@ public void getTargetWithPagingLimitRequestParameter() throws Exception { .andExpect(jsonPath("$.content.[?(@.name=='" + idA + "')].query", contains(testQuery))); } + @Test + public void checkIfFullRepresentationInTargetFilterReturnsDistributionSetHrefWithFilter() throws Exception { + final String testQuery = "name==test"; + + final DistributionSet set = testdataFactory.createDistributionSet(); + final TargetFilterQuery filterQuery = createSingleTargetFilterQuery("a", testQuery); + final String hrefPrefix = "http://localhost" + MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/" + + filterQuery.getId(); + final String distributionsetHrefPrefix = "http://localhost" + MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING; + + final String dsQuery = "?offset=0&limit=50&q=name==" + set.getName() + ";" + "version==" + set.getVersion(); + + mvc.perform( + post(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/" + filterQuery.getId() + "/autoAssignDS") + .content("{\"id\":" + set.getId() + "}").contentType(MediaType.APPLICATION_JSON)) + .andDo(print()).andExpect(status().isOk()); + + final String result = mvc.perform( + get(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/" + filterQuery.getId())) + .andExpect(jsonPath("$._links.autoAssignDS.href", equalTo(hrefPrefix + "/autoAssignDS"))) + .andExpect(jsonPath("$._links.DS.href", startsWith(distributionsetHrefPrefix))) + .andReturn().getResponse().getContentAsString(); + + final String multipleResult = mvc.perform( + get(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "?representation=full")) + .andExpect(jsonPath("$.content", hasSize(1))).andExpect(jsonPath("$.total", equalTo(1))) + .andExpect(jsonPath("$.content[0]._links.DS.href", startsWith(distributionsetHrefPrefix))) + .andReturn().getResponse().getContentAsString(); + + final JSONObject singleJson = new JSONObject(result); + final JSONObject multipleJson = new JSONObject(multipleResult); + + final String resultDSURI = singleJson.getJSONObject("_links").getJSONObject("DS").getString("href"); + final String resultDSURIFromMultipleJson = multipleJson.getJSONArray("content").getJSONObject(0) + .getJSONObject("_links").getJSONObject("DS").getString("href"); + + Assertions.assertEquals(distributionsetHrefPrefix + dsQuery, UriUtils.decode(resultDSURI, StandardCharsets.UTF_8)); + Assertions.assertEquals(distributionsetHrefPrefix + dsQuery, + UriUtils.decode(resultDSURIFromMultipleJson, StandardCharsets.UTF_8)); + } + @Test @Description("Ensures that request returns list of filters in defined format in size reduced by given limit and offset parameter.") public void getTargetWithPagingLimitAndOffsetRequestParameter() throws Exception { @@ -273,23 +353,6 @@ public void getSingleTarget() throws Exception { .andExpect(jsonPath("$._links.autoAssignDS.href", equalTo(hrefPrefix + "/autoAssignDS"))); } - @Test - @Description("Ensures that results for a single target filter query can be retrieved via its id.") - public void getSingleResults() throws Exception { - final String knownTarget = "test1"; - final String knownQuery = "controllerId==test1"; - - final TargetFilterQuery tfq = createSingleTargetFilterQuery("results", knownQuery); - - testdataFactory.createTarget(knownTarget); - testdataFactory.createTarget("test2"); - - mvc.perform(get(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/" + tfq.getId() + "/results")) - .andDo(print()).andExpect(status().isOk()) - .andExpect(jsonPath("$", hasSize(1))) - .andExpect(jsonPath("$[0]", equalTo(knownTarget))); - } - @Test @Description("Ensures that the retrieval of a non-existing target filter query results in a HTTP Not found error (404).") public void getSingleTargetNoExistsResponseNotFound() throws Exception { @@ -350,6 +413,7 @@ public void setAutoAssignDistributionSetOnFilterQueryThatExceedsQuota() throws E final DistributionSet set = testdataFactory.createDistributionSet(); final TargetFilterQuery filterQuery = createSingleTargetFilterQuery("1", "controllerId==target*"); + mvc.perform( post(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/" + filterQuery.getId() + "/autoAssignDS") .content("{\"id\":" + set.getId() + "}").contentType(MediaType.APPLICATION_JSON)) @@ -563,6 +627,53 @@ private void verifyAutoAssignmentWithSoftDeletedDs(final TargetFilterQuery tfq) .andExpect(jsonPath(JSON_PATH_ERROR_CODE, equalTo(SpServerError.SP_REPO_ENTITY_NOT_EXISTS.getKey()))); } + @Test + @Description("Handles the GET request of retrieving a the auto assign distribution set of a target filter query within SP.") + public void getAssignDS() throws Exception { + final TargetFilterQuery filterQuery = createSingleTargetFilterQuery("filter_01", "name==test_01"); + final DistributionSet ds = testdataFactory.createDistributionSet("ds"); + targetFilterQueryManagement + .updateAutoAssignDS(entityFactory.targetFilterQuery() + .updateAutoAssign(filterQuery.getId()).ds(ds.getId())); + + mvc.perform(get(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{targetFilterQueryId}/autoAssignDS", + filterQuery.getId())) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + } + + @Test + @Description("Handles the POST request of setting a distribution set for auto assignment within SP.") + public void createAutoAssignDS() throws Exception { + enableMultiAssignments(); + enableConfirmationFlow(); + + final String filterName = "filter_01"; + final TargetFilterQuery filterQuery = createSingleTargetFilterQuery(filterName, "name==test_01"); + final DistributionSet distributionSet = testdataFactory.createDistributionSet("ds"); + final String autoAssignBody = new JSONObject().put("id", distributionSet.getId()) + .put("type", MgmtActionType.SOFT.getName()).put("weight", 200).toString(); + + mvc + .perform(post(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{targetFilterQueryId}/autoAssignDS", + filterQuery.getId()).contentType(MediaType.APPLICATION_JSON).content(autoAssignBody.toString())) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + } + + @Test + @Description("Handles the DELETE request of deleting the auto assign distribution set from a target filter query within SP.") + public void deleteAutoAssignDS() throws Exception { + final String filterName = "filter_01"; + final TargetFilterQuery filterQuery = createSingleTargetFilterQuery(filterName, "name==test_01"); + mvc + .perform(delete( + MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{targetFilterQueryId}/autoAssignDS", + filterQuery.getId())) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isNoContent()); + } + @Test @Description("Ensures that the deletion of auto-assignment distribution set works as intended, deleting the auto-assignment action type as well") public void deleteAutoAssignDistributionSetOfTargetFilterQuery() throws Exception { @@ -628,5 +739,4 @@ public void weightValidation() throws Exception { private TargetFilterQuery createSingleTargetFilterQuery(final String name, final String query) { return targetFilterQueryManagement.create(entityFactory.targetFilterQuery().create().name(name).query(query)); } - } diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java index 24fe964568..b858fad90e 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetResourceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -13,11 +14,48 @@ import io.qameta.allure.Feature; import io.qameta.allure.Step; import io.qameta.allure.Story; +import static org.assertj.core.api.Assertions.assertThat; +import static org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.hasKey; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.notNullValue; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import java.time.Duration; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import javax.validation.ConstraintViolationException; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.Lists; import org.apache.commons.lang3.RandomStringUtils; import org.awaitility.Awaitility; import org.eclipse.hawkbit.exception.SpServerError; import org.eclipse.hawkbit.im.authentication.SpPermission; import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType; +import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTargetAutoConfirmUpdate; import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; import org.eclipse.hawkbit.repository.ActionFields; import org.eclipse.hawkbit.repository.Identifiable; @@ -27,6 +65,16 @@ import org.eclipse.hawkbit.repository.model.*; import org.eclipse.hawkbit.repository.model.Action.ActionType; import org.eclipse.hawkbit.repository.model.Action.Status; +import org.eclipse.hawkbit.repository.model.ActionStatus; +import org.eclipse.hawkbit.repository.model.DistributionSet; +import org.eclipse.hawkbit.repository.model.MetaData; +import org.eclipse.hawkbit.repository.model.NamedEntity; +import org.eclipse.hawkbit.repository.model.Rollout; +import org.eclipse.hawkbit.repository.model.SoftwareModule; +import org.eclipse.hawkbit.repository.model.Target; +import org.eclipse.hawkbit.repository.model.TargetMetadata; +import org.eclipse.hawkbit.repository.model.TargetType; +import org.eclipse.hawkbit.repository.model.TargetUpdateStatus; import org.eclipse.hawkbit.repository.test.util.WithUser; import org.eclipse.hawkbit.rest.exception.MessageNotReadableException; import org.eclipse.hawkbit.rest.json.model.ExceptionInfo; @@ -105,6 +153,8 @@ class MgmtTargetResourceTest extends AbstractManagementApiIntegrationTest { private static final String JSON_PATH_LAST_REQUEST_AT = JSON_PATH_ROOT + JSON_PATH_FIELD_LAST_REQUEST_AT; private static final String JSON_PATH_TYPE = JSON_PATH_ROOT + JSON_PATH_FIELD_TARGET_TYPE; + @Autowired + private ObjectMapper objectMapper; @Autowired private JpaProperties jpaProperties; @@ -435,27 +485,27 @@ public void updateTargetAndUnnasignTargetType() throws Exception { final Long unnasignTargetTypeValue = -1L; final TargetType targetType = targetTypeManagement.create( - entityFactory.targetType().create().name("targettype1").description("targettypedes1")); + entityFactory.targetType().create().name("targettype1").description("targettypedes1")); final String body = new JSONObject().put("targetType", unnasignTargetTypeValue).toString(); // create a target with the created TargetType targetManagement.create(entityFactory.target().create().controllerId(knownControllerId).name(knownNameNotModify) - .address(knownNewAddress).targetType(targetType.getId())); + .address(knownNewAddress).targetType(targetType.getId())); mvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownControllerId) - .contentType(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(jsonPath("$.controllerId", equalTo(knownControllerId))) - .andExpect(jsonPath("$.address", equalTo(knownNewAddress))) - .andExpect(jsonPath("$.name", equalTo(knownNameNotModify))) - .andExpect(jsonPath("$.targetType").exists()); + .contentType(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) + .andExpect(jsonPath("$.controllerId", equalTo(knownControllerId))) + .andExpect(jsonPath("$.address", equalTo(knownNewAddress))) + .andExpect(jsonPath("$.name", equalTo(knownNameNotModify))) + .andExpect(jsonPath("$.targetType").exists()); mvc.perform(put(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownControllerId).content(body) - .contentType(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(jsonPath("$.controllerId", equalTo(knownControllerId))) - .andExpect(jsonPath("$.address", equalTo(knownNewAddress))) - .andExpect(jsonPath("$.name", equalTo(knownNameNotModify))) - .andExpect(jsonPath("$.targetType").doesNotExist()); + .contentType(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) + .andExpect(jsonPath("$.controllerId", equalTo(knownControllerId))) + .andExpect(jsonPath("$.address", equalTo(knownNewAddress))) + .andExpect(jsonPath("$.name", equalTo(knownNameNotModify))) + .andExpect(jsonPath("$.targetType").doesNotExist()); } @@ -469,30 +519,30 @@ public void updateTargetNameAndUnnasignTargetType() throws Exception { final String controllerNewName = "controllerNewName"; final TargetType targetType = targetTypeManagement.create( - entityFactory.targetType().create().name("targettype1").description("targettypedes1")); + entityFactory.targetType().create().name("targettype1").description("targettypedes1")); final String body = new JSONObject() - .put("targetType", unnasignTargetTypeValue).put("name", "controllerNewName") - .toString(); + .put("targetType", unnasignTargetTypeValue).put("name", "controllerNewName") + .toString(); // create a target with the created TargetType targetManagement.create(entityFactory.target().create().controllerId(knownControllerId).name(knownNameNotModify) - .address(knownNewAddress).targetType(targetType.getId())); + .address(knownNewAddress).targetType(targetType.getId())); mvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownControllerId) - .contentType(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(jsonPath("$.controllerId", equalTo(knownControllerId))) - .andExpect(jsonPath("$.address", equalTo(knownNewAddress))) - .andExpect(jsonPath("$.name", equalTo(knownNameNotModify))) - .andExpect(jsonPath("$.targetType").exists()); + .contentType(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) + .andExpect(jsonPath("$.controllerId", equalTo(knownControllerId))) + .andExpect(jsonPath("$.address", equalTo(knownNewAddress))) + .andExpect(jsonPath("$.name", equalTo(knownNameNotModify))) + .andExpect(jsonPath("$.targetType").exists()); //check if controller name is updated AND target type is missing (not assigned) mvc.perform(put(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/" + knownControllerId).content(body) - .contentType(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(jsonPath("$.controllerId", equalTo(knownControllerId))) - .andExpect(jsonPath("$.address", equalTo(knownNewAddress))) - .andExpect(jsonPath("$.name", equalTo(controllerNewName))) - .andExpect(jsonPath("$.targetType").doesNotExist()); + .contentType(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) + .andExpect(jsonPath("$.controllerId", equalTo(knownControllerId))) + .andExpect(jsonPath("$.address", equalTo(knownNewAddress))) + .andExpect(jsonPath("$.name", equalTo(controllerNewName))) + .andExpect(jsonPath("$.targetType").doesNotExist()); } @Test @@ -1052,8 +1102,8 @@ void getCancelActionWithMaintenanceWindow() throws Exception { } @Test - @Description("Ensures that the expected response of geting actions of a target is returned.") - void getMultipleActions() throws Exception { + @Description("Ensures that the expected response of getting actions of a target is returned.") + void getActions() throws Exception { final String knownTargetId = "targetId"; final List actions = generateTargetWithTwoUpdatesWithOneOverride(knownTargetId); @@ -1077,7 +1127,7 @@ void getMultipleActions() throws Exception { @Test @Description("Ensures that the expected response of getting actions with maintenance window of a target is returned.") - void getMultipleActionsWithMaintenanceWindow() throws Exception { + void getActionsWithMaintenanceWindow() throws Exception { final String knownTargetId = "targetId"; final String schedule = getTestSchedule(10); final String duration = getTestDuration(10); @@ -1115,7 +1165,7 @@ void getMultipleActionsWithMaintenanceWindow() throws Exception { @Test @Description("Verifies that the API returns the status list with expected content.") - void getMultipleActionStatus() throws Exception { + void getActionsStatus() throws Exception { final String knownTargetId = "targetId"; final Action action = generateTargetWithTwoUpdatesWithOneOverride(knownTargetId).get(0); // retrieve list in default descending order for actionstaus entries @@ -1143,7 +1193,7 @@ void getMultipleActionStatus() throws Exception { @Test @Description("Verifies that the API returns the status list with expected content sorted by reportedAt field.") - void getMultipleActionStatusSortedByReportedAt() throws Exception { + void getActionsStatusSortedByReportedAt() throws Exception { final String knownTargetId = "targetId"; final Action action = generateTargetWithTwoUpdatesWithOneOverride(knownTargetId).get(0); final List actionStatus = deploymentManagement.findActionStatusByAction(PAGE, action.getId()) @@ -1189,7 +1239,7 @@ void getMultipleActionStatusSortedByReportedAt() throws Exception { @Test @Description("Verifies that the API returns the status list with expected content split into two pages.") - void getMultipleActionStatusWithPagingLimitRequestParameter() throws Exception { + void getActionsStatusWithPagingLimitRequestParameter() throws Exception { final String knownTargetId = "targetId"; final Action action = generateTargetWithTwoUpdatesWithOneOverride(knownTargetId).get(0); @@ -1229,7 +1279,7 @@ void getMultipleActionStatusWithPagingLimitRequestParameter() throws Exception { @Test @Description("Verifies getting multiple actions with the paging request parameter.") - void getMultipleActionsWithPagingLimitRequestParameter() throws Exception { + void getActionsWithPagingLimitRequestParameter() throws Exception { final String knownTargetId = "targetId"; final List actions = generateTargetWithTwoUpdatesWithOneOverride(knownTargetId); @@ -1679,7 +1729,7 @@ void invalidRequestsOnActionStatusResource() throws Exception { } @Test - void getControllerAttributesViaTargetResourceReturnsAttributesWithOk() throws Exception { + void getControllerAttributesReturnsAttributesWithOk() throws Exception { // create target with attributes final String knownTargetId = "targetIdWithAttributes"; final Map knownControllerAttrs = new HashMap<>(); @@ -1755,6 +1805,21 @@ private void verifyResettingRequestAttributesIsNotAllowed(final String knownTarg assertThat(targetManagement.isControllerAttributesRequested(knownTargetId)).isTrue(); } + @Test + @Description("Handles the GET request of retrieving all targets within SP..") + public void getTargets() throws Exception { + enableConfirmationFlow(); + mvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING)).andExpect(status().isOk()) + .andDo(MockMvcResultPrinter.print()); + } + + @Test + @Description("Handles the GET request of retrieving all targets within SP based by parameter.") + public void getTargetsWithParameters() throws Exception { + mvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "?limit=10&sort=name:ASC&offset=0&q=name==a")) + .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()); + } + @Test void searchTargetsUsingRsqlQuery() throws Exception { final int amountTargets = 10; @@ -1935,8 +2000,8 @@ void deleteMetadataThatDoesNotExistLeadsToNotFound() throws Exception { } @Test - @Description("Ensures that a metadata entry selection through API reflectes the repository content.") - void getSingleMetadata() throws Exception { + @Description("Ensures that a metadata entry selection through API reflects the repository content.") + void getMetadataKey() throws Exception { final String knownControllerId = "targetIdWithMetadata"; // prepare and create metadata for deletion @@ -1950,6 +2015,24 @@ void getSingleMetadata() throws Exception { .andExpect(jsonPath("key", equalTo(knownKey))).andExpect(jsonPath("value", equalTo(knownValue))); } + @Test + @Description("Get a paged list of meta data for a target with standard page size.") + public void getMetadata() throws Exception { + final int totalMetadata = 4; + final String knownKeyPrefix = "knownKey"; + final String knownValuePrefix = "knownValue"; + final Target testTarget = testdataFactory.createTarget("targetId"); + for (int index = 0; index < totalMetadata; index++) { + targetManagement.createMetaData(testTarget.getControllerId(), Lists.newArrayList( + entityFactory.generateTargetMetadata(knownKeyPrefix + index, knownValuePrefix + index))); + } + + mvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/metadata", testTarget.getControllerId())) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaTypes.HAL_JSON)); + } + @Test @Description("Ensures that a metadata entry paged list selection through API reflectes the repository content.") void getPagedListOfMetadata() throws Exception { @@ -2497,6 +2580,33 @@ void autoConfirmStateReferenceOnTarget() throws Exception { .andExpect(jsonPath("autoConfirmActive").exists()).andExpect(jsonPath("_links.autoConfirm").exists()); } + @Test + @Description("Handles the POST request to activate auto-confirm on a target. Payload can be provided to specify more details about the operation.") + public void postActivateAutoConfirm() throws Exception { + final Target testTarget = testdataFactory.createTarget("targetId"); + + final MgmtTargetAutoConfirmUpdate body = new MgmtTargetAutoConfirmUpdate("custom_initiator_value", + "custom_remark_value"); + + mvc.perform(post(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" + TARGET_V1_AUTO_CONFIRM + "/" + + TARGET_V1_ACTIVATE_AUTO_CONFIRM, testTarget.getControllerId()) + .content(objectMapper.writeValueAsString(body)).contentType(MediaType.APPLICATION_JSON)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + } + + @Test + @Description("Handles the POST request to deactivate auto-confirm on a target.") + public void postDeactivateAutoConfirm() throws Exception { + final Target testTarget = testdataFactory.createTarget("targetId"); + confirmationManagement.activateAutoConfirmation(testTarget.getControllerId(), null, null); + + mvc.perform(post(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" + TARGET_V1_AUTO_CONFIRM + "/" + + TARGET_V1_DEACTIVATE_AUTO_CONFIRM, testTarget.getControllerId())) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + } + @Test @Description("Verifies that the status code that was reported in the last action status update is correctly exposed via the action.") void lastActionStatusCode() throws Exception { diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResourceTest.java index 2e64763649..e9b275c0ea 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTagResourceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -76,7 +77,17 @@ public void getTargetTags() throws Exception { } @Test - @Description("Verfies that a paged result list of target tags reflects on the content of assigned tags for specific controller/target ID") + @Description("Handles the GET request of retrieving all targets tags within SP based by parameter") + public void getTargetTagsWithParameters() throws Exception { + final List tags = testdataFactory.createTargetTags(2, ""); + final TargetTag assigned = tags.get(0); + final TargetTag unassigned = tags.get(1); + mvc.perform(get(MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING + "?limit=10&sort=name:ASC&offset=0&q=name==targetTag")) + .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()); + } + + @Test + @Description("Verifies that a paged result list of target tags reflects on the content of assigned tags for specific controller/target ID") public void getTargetTagsByTargetId() throws Exception { final String controllerId1 = "controllerTestId1"; final String controllerId2 = "controllerTestId2"; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeResourceTest.java index b2947c7b1f..b6740b30d7 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTargetTypeResourceTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; @@ -23,7 +24,6 @@ import org.eclipse.hawkbit.exception.SpServerError; import org.eclipse.hawkbit.im.authentication.SpPermission; import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; -import org.eclipse.hawkbit.repository.builder.DistributionSetTypeCreate; import org.eclipse.hawkbit.repository.builder.TargetTypeCreate; import org.eclipse.hawkbit.repository.exception.AssignmentQuotaExceededException; import org.eclipse.hawkbit.repository.model.DistributionSetType; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResourceTest.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResourceTest.java index c1f430961c..4056dc58a0 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResourceTest.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/MgmtTenantManagementResourceTest.java @@ -1,18 +1,28 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.eclipse.hawkbit.mgmt.json.model.system.MgmtSystemTenantConfigurationValueRequest; import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; +import org.eclipse.hawkbit.repository.model.DistributionSetType; import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; +import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties; import org.json.JSONObject; import org.junit.jupiter.api.Test; import org.springframework.http.MediaType; @@ -20,6 +30,7 @@ import io.qameta.allure.Description; import io.qameta.allure.Feature; import io.qameta.allure.Story; +import org.springframework.test.web.servlet.ResultMatcher; /** * Spring MVC Tests against the MgmtTenantManagementResource. @@ -38,8 +49,108 @@ public class MgmtTenantManagementResourceTest extends AbstractManagementApiInteg private static final String AUTHENTICATION_GATEWAYTOKEN_KEY = "authentication.gatewaytoken.key"; + private static final String DEFAULT_DISTRIBUTION_SET_TYPE_KEY = "default.ds.type"; + + @Test + @Description("Handles GET request for receiving all tenant specific configurations.") + public void getTenantConfigurations() throws Exception { + mvc.perform(get(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/")) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()) + //check for TenantMetadata additional properties + .andExpect(jsonPath("$.['" + DEFAULT_DISTRIBUTION_SET_TYPE_KEY + "']").exists()) + .andExpect(jsonPath("$.['" + DEFAULT_DISTRIBUTION_SET_TYPE_KEY + "'].value", equalTo(getActualDefaultDsType().intValue()))); + + } + + @Test + @Description("Handles GET request for receiving a tenant specific configuration.") + public void getTenantConfiguration() throws Exception { + //Test TenantConfiguration property + mvc.perform(get(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/{keyName}/", + TenantConfigurationProperties.TenantConfigurationKey.AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + } + + @Test + @Description("Handles GET request for receiving (TenantMetadata - DefaultDsType) a tenant specific configuration.") + public void getTenantMetadata() throws Exception { + //Test TenantMetadata property + mvc.perform(get(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/{keyName}/", + DEFAULT_DISTRIBUTION_SET_TYPE_KEY)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()) + .andExpect(jsonPath("$.value", equalTo(getActualDefaultDsType().intValue()))); + } + + @Test + @Description("Handles PUT request for settings values in tenant specific configuration.") + public void putTenantConfiguration() throws Exception { + final MgmtSystemTenantConfigurationValueRequest bodyPut = new MgmtSystemTenantConfigurationValueRequest(); + bodyPut.setValue("exampleToken"); + final ObjectMapper mapper = new ObjectMapper(); + final String json = mapper.writeValueAsString(bodyPut); + mvc.perform(put(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/{keyName}/", + TenantConfigurationProperties.TenantConfigurationKey.AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY).content(json) + .contentType(MediaType.APPLICATION_JSON)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + } + + @Test + @Description("Handles PUT request for settings values (TenantMetadata - DefaultDsType) in tenant specific configuration, which is TenantMetadata") + public void putTenantMetadata() throws Exception { + final MgmtSystemTenantConfigurationValueRequest bodyPut = new MgmtSystemTenantConfigurationValueRequest(); + + long updatedTestDefaultDsType = createTestDistributionSetType(); + bodyPut.setValue(updatedTestDefaultDsType); + + final ObjectMapper mapper = new ObjectMapper(); + final String json = mapper.writeValueAsString(bodyPut); + + mvc.perform(put(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/{keyName}/", + DEFAULT_DISTRIBUTION_SET_TYPE_KEY).content(json) + .contentType(MediaType.APPLICATION_JSON)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + + //check if after Rest success, value is really changed in TenantMetadata + assertEquals(updatedTestDefaultDsType, getActualDefaultDsType(), "Rest endpoint for updating the Default DistributionSetType completed successfully, but the actual value was not changed."); + } + + private Long createTestDistributionSetType() { + DistributionSetType testDefaultDsType = distributionSetTypeManagement.create(entityFactory.distributionSetType().create() + .key("test123").name("TestName123").description("TestDefaultDsType")); + testDefaultDsType = distributionSetTypeManagement + .update(entityFactory.distributionSetType().update(testDefaultDsType.getId()).description("TestDefaultDsType")); + return testDefaultDsType.getId(); + } + + @Test + @Description("Update DefaultDistributionSetType Fails if given DistributionSetType ID does not exist.") + public void putTenantMetadataFails() throws Exception{ + long oldDefaultDsType = getActualDefaultDsType(); + //try an invalid input + String newDefaultDsType = new JSONObject().put("value", true).toString(); + assertDefaultDsTypeUpdateBadRequestFails(newDefaultDsType, oldDefaultDsType, status().isBadRequest()); + //try an invalid input + newDefaultDsType = new JSONObject().put("value", "someInvalidInput").toString(); + assertDefaultDsTypeUpdateBadRequestFails(newDefaultDsType, oldDefaultDsType, status().isBadRequest()); + //try valid input, but the given DistributionSetType Id does not exist.. + newDefaultDsType = new JSONObject().put("value", 99999).toString(); + assertDefaultDsTypeUpdateBadRequestFails(newDefaultDsType, oldDefaultDsType, status().isNotFound()); + } + private void assertDefaultDsTypeUpdateBadRequestFails(String newDefaultDsType, long oldDefaultDsType, ResultMatcher resultMatchers) throws Exception { + mvc.perform(put(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/{keyName}/", + DEFAULT_DISTRIBUTION_SET_TYPE_KEY).content(newDefaultDsType) + .contentType(MediaType.APPLICATION_JSON)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(resultMatchers); + assertEquals(oldDefaultDsType, getActualDefaultDsType(), "Rest endpoint for updating DefaultDistributionType failed, but actual value changed unexpectedly."); + } @Test @Description("The 'multi.assignments.enabled' property must not be changed to false.") @@ -57,33 +168,93 @@ public void deactivateMultiAssignment() throws Exception { } @Test - @Description("The Batch configuration should be applied") - public void changeBatchConfiguration() throws Exception { - JSONObject configuration = new JSONObject(); - configuration.put(ROLLOUT_APPROVAL_ENABLED, true); - configuration.put(AUTHENTICATION_GATEWAYTOKEN_ENABLED, true); - configuration.put(AUTHENTICATION_GATEWAYTOKEN_KEY, "1234"); + @Description("The Batch configuration should not be applied, because of invalid TenantConfiguration props") + public void changeBatchConfigurationShouldFailOnInvalidTenantConfiguration() throws Exception { + //in this scenario + // some TenantConfiguration are not valid, + // TenantMetadata - DefaultDSType ID is valid, + //in the end batch configuration update must fail, and thus, not a single config should be actually changed + long testValidDistributionSetType = createTestDistributionSetType(); + boolean oldRolloutApprovalConfig = (Boolean) tenantConfigurationManagement.getConfigurationValue(ROLLOUT_APPROVAL_ENABLED).getValue(); + String oldAuthGatewayToken = (String) tenantConfigurationManagement.getConfigurationValue(AUTHENTICATION_GATEWAYTOKEN_KEY).getValue(); + //test TenantConfiguration with invalid config value, and a valid TenantMetadata - Default DistributionSetType id + assertBatchConfigurationFails(!oldRolloutApprovalConfig, "invalid-config-value", oldAuthGatewayToken + "randomSuffix0", testValidDistributionSetType, status().isBadRequest()); + } + + @Test + @Description("The Batch configuration should not be applied, because of invalid TenantMetadata (DefaultDistributionSetType)") + public void changeBatchConfigurationShouldOnInvalidTenantMetadata() throws Exception { + //in this scenario + // all TenantConfiguration have valid and new values - using old values, inverted + // TenantMetadata - DefaultDSType ID is invalid + //in the end batch configuration update must fail, and thus, not a single config should be actually changed. + boolean oldRolloutApprovalConfig = (Boolean) tenantConfigurationManagement.getConfigurationValue(ROLLOUT_APPROVAL_ENABLED).getValue(); + boolean oldAuthGatewayTokenEnabled = (Boolean) tenantConfigurationManagement.getConfigurationValue(AUTHENTICATION_GATEWAYTOKEN_ENABLED).getValue(); + String oldAuthGatewayToken = (String) tenantConfigurationManagement.getConfigurationValue(AUTHENTICATION_GATEWAYTOKEN_KEY).getValue(); + + //invalid TenantMetadata Default DistributionSetType, it is expected to be a number. Testing invalid type - string + //not a single configuration should be changed after the failure + Object testInvalidDistributionSetType = "someInvalidInput"; + assertBatchConfigurationFails(!oldRolloutApprovalConfig, !oldAuthGatewayTokenEnabled, oldAuthGatewayToken + "randomSuffix1", testInvalidDistributionSetType, status().isBadRequest()); + //invalid TenantMetadata Default DistributionSetType, it is expected to be a number. Testing invalid type - bool + //not a single configuration should be changed after the failure + testInvalidDistributionSetType = true; + assertBatchConfigurationFails(!oldRolloutApprovalConfig, !oldAuthGatewayTokenEnabled, oldAuthGatewayToken + "randomSuffix2", testInvalidDistributionSetType, status().isBadRequest()); + + //Valid TenantMetadata Default DistributionSetType, it is expected to be a number. Testing valid type - but given DistributionSetType Id does not exist. + //not a single configuration should be changed after the failure + testInvalidDistributionSetType = 9999; + assertBatchConfigurationFails(!oldRolloutApprovalConfig, !oldAuthGatewayTokenEnabled, oldAuthGatewayToken + "randomSuffix2", testInvalidDistributionSetType, status().isNotFound()); + } + + private void assertBatchConfigurationFails(Object newRolloutApprovalEnabled, Object newAuthGatewayTokenEnabled, Object newGatewayToken, Object newDistributionSetTypeId, ResultMatcher resultMatchers) throws Exception { + long oldDefaultDsType = getActualDefaultDsType(); + boolean oldRolloutApprovalConfig = (Boolean) tenantConfigurationManagement.getConfigurationValue(ROLLOUT_APPROVAL_ENABLED).getValue(); + boolean oldAuthGatewayTokenEnabled = (Boolean) tenantConfigurationManagement.getConfigurationValue(AUTHENTICATION_GATEWAYTOKEN_ENABLED).getValue(); + String oldAuthGatewayToken = (String) tenantConfigurationManagement.getConfigurationValue(AUTHENTICATION_GATEWAYTOKEN_KEY).getValue(); + + JSONObject configuration = new JSONObject(); + configuration.put(ROLLOUT_APPROVAL_ENABLED, newRolloutApprovalEnabled); + configuration.put(AUTHENTICATION_GATEWAYTOKEN_ENABLED, newAuthGatewayTokenEnabled); + configuration.put(AUTHENTICATION_GATEWAYTOKEN_KEY, newGatewayToken); + configuration.put(DEFAULT_DISTRIBUTION_SET_TYPE_KEY, newDistributionSetTypeId); String body = configuration.toString(); mvc.perform(put(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs") - .content(body).contentType(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()) - .andExpect(status().isOk()); + .content(body).contentType(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()) + .andExpect(resultMatchers); + //Check if TenantMetadata and TenantConfiguration is not changed as Batch config failed + assertEquals(oldDefaultDsType, getActualDefaultDsType(), "Batch configuration update Failed, but TenantMetadata - DistributionSetType was actually changed."); + assertEquals(oldRolloutApprovalConfig, tenantConfigurationManagement.getConfigurationValue(ROLLOUT_APPROVAL_ENABLED).getValue(), "Batch configuration update Failed, but TenantConfiguration was actually changed."); + assertEquals(oldAuthGatewayTokenEnabled, tenantConfigurationManagement.getConfigurationValue(AUTHENTICATION_GATEWAYTOKEN_ENABLED).getValue(), "Batch configuration update Failed, but TenantConfiguration was actually changed."); + assertEquals(oldAuthGatewayToken, tenantConfigurationManagement.getConfigurationValue(AUTHENTICATION_GATEWAYTOKEN_KEY).getValue(), "Batch configuration update Failed, but TenantConfiguration was actually changed."); } @Test - @Description("The Batch configuration should not be applied") - public void changeBatchConfigurationFail() throws Exception { + @Description("The Batch configuration should be applied") + public void changeBatchConfiguration() throws Exception { + long updatedDistributionSetType = createTestDistributionSetType(); + boolean updatedRolloutApprovalEnabled = true; + boolean updatedAuthGatewayTokenEnabled = true; + String updatedAuthGatewayTokenKey = "54321"; JSONObject configuration = new JSONObject(); - configuration.put(ROLLOUT_APPROVAL_ENABLED, true); - configuration.put(AUTHENTICATION_GATEWAYTOKEN_ENABLED, "wrong"); - configuration.put(AUTHENTICATION_GATEWAYTOKEN_KEY, "1234"); + configuration.put(ROLLOUT_APPROVAL_ENABLED, updatedRolloutApprovalEnabled); + configuration.put(AUTHENTICATION_GATEWAYTOKEN_ENABLED, updatedAuthGatewayTokenEnabled); + configuration.put(AUTHENTICATION_GATEWAYTOKEN_KEY, updatedAuthGatewayTokenKey); + configuration.put(DEFAULT_DISTRIBUTION_SET_TYPE_KEY, updatedDistributionSetType); String body = configuration.toString(); mvc.perform(put(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs") - .content(body).contentType(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()) - .andExpect(status().isBadRequest()); + .content(body).contentType(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + + //assert all changes were applied after Rest Success + assertEquals(updatedDistributionSetType, getActualDefaultDsType(), "Change BatchConfiguration was successful but TenantMetadata - Default DistributionSetType was not actually changed."); + assertEquals(updatedRolloutApprovalEnabled, tenantConfigurationManagement.getConfigurationValue(ROLLOUT_APPROVAL_ENABLED).getValue(), "Change BatchConfiguration was successful but TenantConfiguration property was not actually changed."); + assertEquals(updatedAuthGatewayTokenEnabled, tenantConfigurationManagement.getConfigurationValue(AUTHENTICATION_GATEWAYTOKEN_ENABLED).getValue(), "Change BatchConfiguration was successful but TenantConfiguration property was not actually changed."); + assertEquals(updatedAuthGatewayTokenKey, tenantConfigurationManagement.getConfigurationValue(AUTHENTICATION_GATEWAYTOKEN_KEY).getValue(), "Change BatchConfiguration was successful but TenantConfiguration property was not actually changed."); } @Test @@ -108,4 +279,26 @@ public void autoCloseCannotBeModifiedIfMultiAssignmentIsEnabled() throws Excepti .andExpect(status().isForbidden()); } + @Test + @Description("Handles DELETE request deleting a tenant specific configuration.") + public void deleteTenantConfiguration() throws Exception { + mvc.perform(delete(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/{keyName}/", + TenantConfigurationProperties.TenantConfigurationKey.AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isOk()); + } + + @Test + @Description("Tests DELETE request must Fail for TenantMetadata properties.") + public void deleteTenantMetadataFail() throws Exception { + mvc.perform(delete(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/{keyName}/", + DEFAULT_DISTRIBUTION_SET_TYPE_KEY)) + .andDo(MockMvcResultPrinter.print()) + .andExpect(status().isBadRequest()); + } + + private Long getActualDefaultDsType() { + return systemManagement.getTenantMetadata().getDefaultDsType().getId(); + } + } diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/ResourceUtility.java b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/ResourceUtility.java index 33afa11bbe..6f225e60c4 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/ResourceUtility.java +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/java/org/eclipse/hawkbit/mgmt/rest/resource/ResourceUtility.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.mgmt.rest.resource; diff --git a/hawkbit-rest/hawkbit-mgmt-resource/src/test/resources/mgmt-test.properties b/hawkbit-rest/hawkbit-mgmt-resource/src/test/resources/mgmt-test.properties index c69732803a..b685a72f96 100644 --- a/hawkbit-rest/hawkbit-mgmt-resource/src/test/resources/mgmt-test.properties +++ b/hawkbit-rest/hawkbit-mgmt-resource/src/test/resources/mgmt-test.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2018 Microsoft and others. +# Copyright (c) 2018 Microsoft and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Logging START - activate to see request/response details diff --git a/hawkbit-rest/hawkbit-rest-core/pom.xml b/hawkbit-rest/hawkbit-rest-core/pom.xml index ae0af26233..55add82162 100644 --- a/hawkbit-rest/hawkbit-rest-core/pom.xml +++ b/hawkbit-rest/hawkbit-rest-core/pom.xml @@ -1,11 +1,12 @@ org.springframework.boot spring-boot-starter-json + + org.springdoc + springdoc-openapi-ui + ${springdoc-openapi.version} + + + org.springdoc + springdoc-openapi-security + ${springdoc-openapi.version} + javax.servlet javax.servlet-api diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/OpenApiConfiguration.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/OpenApiConfiguration.java new file mode 100644 index 0000000000..6b9f09c20e --- /dev/null +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/OpenApiConfiguration.java @@ -0,0 +1,103 @@ +/** + * Copyright (c) 2023 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + */ +package org.eclipse.hawkbit.rest; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import org.springdoc.core.GroupedOpenApi; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ConditionalOnProperty( + value="hawkbit.server.swagger.enabled", + havingValue = "true", + matchIfMissing = true) +public class OpenApiConfiguration { + + private static final String API_TITLE = "hawkBit REST APIs"; + private static final String API_VERSION = "v1"; + private static final String DESCRIPTION = """ + Eclipse hawkBit™ is a domain-independent back-end framework for rolling out software updates to constrained edge devices as well as more powerful controllers and gateways connected to IP based networking infrastructure. + """; + + private static final String BASIC_AUTH_SEC_SCHEME_NAME = "Basic Authentication"; + private static final String BEARER_AUTH_SEC_SCHEME_NAME = "Bearer Authentication"; + private static final String DDI_TOKEN_SEC_SCHEME_NAME = "DDI Target/GatewayToken Authentication"; + + @Bean + public OpenAPI openApi() { + return new OpenAPI().info(new Info().title(API_TITLE).version(API_VERSION).description(DESCRIPTION)); + } + + @Bean + @ConditionalOnProperty( + value="hawkbit.server.swagger.mgmt.api.group.enabled", + havingValue = "true", + matchIfMissing = true) + public GroupedOpenApi mgmtApi() { + return GroupedOpenApi + .builder() + .group("Management API") + .pathsToMatch("/rest/v1/**") + .addOpenApiCustomiser(openApi -> { + openApi + .addSecurityItem(new SecurityRequirement() + .addList(BASIC_AUTH_SEC_SCHEME_NAME) + .addList(BEARER_AUTH_SEC_SCHEME_NAME)) + .components( + openApi + .getComponents() + .addSecuritySchemes(BASIC_AUTH_SEC_SCHEME_NAME, + new SecurityScheme() + .name(BASIC_AUTH_SEC_SCHEME_NAME) + .type(SecurityScheme.Type.HTTP) + .in(SecurityScheme.In.HEADER) + .scheme("basic")) + .addSecuritySchemes(BEARER_AUTH_SEC_SCHEME_NAME, + new SecurityScheme() + .name(BEARER_AUTH_SEC_SCHEME_NAME) + .type(SecurityScheme.Type.HTTP) + .in(SecurityScheme.In.HEADER) + .bearerFormat("JWT") + .scheme("bearer"))); + }) + .build(); + } + @Bean + @ConditionalOnProperty( + value="hawkbit.server.swagger.ddi.api.group.enabled", + havingValue = "true", + matchIfMissing = true) + public GroupedOpenApi ddiApi() { + return GroupedOpenApi + .builder() + .group("Direct Device Integration API") + .pathsToMatch("/{tenant}/controller/**") + .addOpenApiCustomiser(openApi -> { + openApi + .addSecurityItem(new SecurityRequirement().addList(DDI_TOKEN_SEC_SCHEME_NAME)) + .components( + openApi + .getComponents() + .addSecuritySchemes(DDI_TOKEN_SEC_SCHEME_NAME, + new SecurityScheme() + .name("Authorization") + .type(SecurityScheme.Type.APIKEY) + .in(SecurityScheme.In.HEADER) + .description("Format: (Target|Gateway)Token <token>"))); + }) + .build(); + } +} diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java index bc389a4fcf..339b7638ee 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/RestConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/data/ResponseList.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/data/ResponseList.java index a95c209bb8..600023e71e 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/data/ResponseList.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/data/ResponseList.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.data; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/data/SortDirection.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/data/SortDirection.java index 3194011f73..370d562a56 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/data/SortDirection.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/data/SortDirection.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.data; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MessageNotReadableException.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MessageNotReadableException.java index 98f4ebf5e1..5534aedee3 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MessageNotReadableException.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MessageNotReadableException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.exception; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MultiPartFileUploadException.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MultiPartFileUploadException.java index eeca421ac0..fe9f68b6eb 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MultiPartFileUploadException.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/MultiPartFileUploadException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.exception; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/ResponseExceptionHandler.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/ResponseExceptionHandler.java index 6a6f0e8331..fb0088d7b5 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/ResponseExceptionHandler.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/ResponseExceptionHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.exception; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/SortParameterSyntaxErrorException.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/SortParameterSyntaxErrorException.java index c31761488f..6a3b1afed9 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/SortParameterSyntaxErrorException.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/SortParameterSyntaxErrorException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.exception; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/SortParameterUnsupportedDirectionException.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/SortParameterUnsupportedDirectionException.java index 6f211a962d..6c2ef2ea22 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/SortParameterUnsupportedDirectionException.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/SortParameterUnsupportedDirectionException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.exception; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/SortParameterUnsupportedFieldException.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/SortParameterUnsupportedFieldException.java index f61334775d..deedb81858 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/SortParameterUnsupportedFieldException.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/exception/SortParameterUnsupportedFieldException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.exception; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/filter/ExcludePathAwareShallowETagFilter.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/filter/ExcludePathAwareShallowETagFilter.java index bdbe053a7d..61f0da881c 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/filter/ExcludePathAwareShallowETagFilter.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/filter/ExcludePathAwareShallowETagFilter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.filter; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfo.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfo.java index d68e0037f5..3a6847a0fa 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfo.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfo.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.json.model; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingFailedException.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingFailedException.java index 57aba2cbfb..f36eb84d36 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingFailedException.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingFailedException.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.util; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingProgressListener.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingProgressListener.java index 0c43265aff..1b5f14ebcd 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingProgressListener.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingProgressListener.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.util; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingUtil.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingUtil.java index 82cfbaec81..1a1341d2f4 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingUtil.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FileStreamingUtil.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.util; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FilterHttpResponse.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FilterHttpResponse.java index 7620e7404b..3ca339f7a1 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FilterHttpResponse.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/FilterHttpResponse.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.util; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/HttpResponseFactoryBean.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/HttpResponseFactoryBean.java index 6df7987e60..523ccd19ee 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/HttpResponseFactoryBean.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/HttpResponseFactoryBean.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.util; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/HttpUtil.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/HttpUtil.java index 87f2bdd7de..4d4034a2be 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/HttpUtil.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/HttpUtil.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.util; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/RequestResponseContextHolder.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/RequestResponseContextHolder.java index f25a98810a..bf31b256a6 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/RequestResponseContextHolder.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/RequestResponseContextHolder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.util; diff --git a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/SortUtility.java b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/SortUtility.java index 76a653b648..f3c2718df5 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/SortUtility.java +++ b/hawkbit-rest/hawkbit-rest-core/src/main/java/org/eclipse/hawkbit/rest/util/SortUtility.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.util; diff --git a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java index ce48f2df3d..4c98bbec52 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java +++ b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/AbstractRestIntegrationTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest; diff --git a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/filter/ExcludePathAwareShallowETagFilterTest.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/filter/ExcludePathAwareShallowETagFilterTest.java index fe20c6ddc3..136ade1398 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/filter/ExcludePathAwareShallowETagFilterTest.java +++ b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/filter/ExcludePathAwareShallowETagFilterTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.filter; diff --git a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfoTest.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfoTest.java index eb0ecac14d..551d88eabd 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfoTest.java +++ b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/json/model/ExceptionInfoTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.json.model; diff --git a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/FileStreamingUtilTest.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/FileStreamingUtilTest.java index 1177b5525e..25bf6d13cf 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/FileStreamingUtilTest.java +++ b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/FileStreamingUtilTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.util; diff --git a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/JsonBuilder.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/JsonBuilder.java index 1ec29635ae..261e3fc758 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/JsonBuilder.java +++ b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/JsonBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.util; diff --git a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/MockMvcResultPrinter.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/MockMvcResultPrinter.java index 07c7b123d8..d074cca56e 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/MockMvcResultPrinter.java +++ b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/MockMvcResultPrinter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.util; diff --git a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SortUtilityTest.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SortUtilityTest.java index 1c48f47ecc..0955f865cd 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SortUtilityTest.java +++ b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SortUtilityTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.util; diff --git a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SuccessCondition.java b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SuccessCondition.java index e112ae5ea4..744fde4c48 100644 --- a/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SuccessCondition.java +++ b/hawkbit-rest/hawkbit-rest-core/src/test/java/org/eclipse/hawkbit/rest/util/SuccessCondition.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.rest.util; diff --git a/hawkbit-rest/hawkbit-rest-docs/README.md b/hawkbit-rest/hawkbit-rest-docs/README.md deleted file mode 100644 index 1a9f74b280..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# hawkBit Rest Documentation tests - -The hawkBit Rest Documentation tests are based on [Rest Docs](https://projects.spring.io/spring-restdocs/). These tests generate documentation for our RESTful services. - -## Run and create snippets - -Run the test with maven - -```bash -mvn clean package -``` - -Every rest test will create snippets (e.g. curl-request.adoc, http-request.adoc) in the target\generated-snippets\ directory. - -## Use the snippets - -The snippets get included using Asciidoc within our API documents in src\main\asciidoc. Those documents in turn are used to generate HTML documents in the target\classes directory when building with maven. diff --git a/hawkbit-rest/hawkbit-rest-docs/pom.xml b/hawkbit-rest/hawkbit-rest-docs/pom.xml deleted file mode 100644 index 21949f99c6..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/pom.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - 4.0.0 - - org.eclipse.hawkbit - hawkbit-rest-parent - 0.3.0-SNAPSHOT - - hawkbit-rest-docs - hawkbit :: REST :: Documentation - - - ${maven.build.timestamp} - - - - - - org.eclipse.hawkbit - hawkbit-repository-api - ${project.version} - test - - - org.eclipse.hawkbit - hawkbit-repository-jpa - ${project.version} - test - - - org.springframework.restdocs - spring-restdocs-mockmvc - test - - - org.springframework.security - spring-security-config - test - - - org.eclipse.hawkbit - hawkbit-rest-core - ${project.version} - tests - test - - - org.eclipse.hawkbit - hawkbit-ddi-resource - ${project.version} - test - - - org.eclipse.hawkbit - hawkbit-mgmt-resource - ${project.version} - test - - - org.eclipse.hawkbit - hawkbit-repository-test - ${project.version} - test - - - org.eclipse.hawkbit - hawkbit-http-security - ${project.version} - test - - - org.springframework.boot - spring-boot-starter-json - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.security - spring-security-aspects - test - - - io.qameta.allure - allure-junit5 - test - - - org.springframework - spring-context-support - test - - - - - - org.asciidoctor - asciidoctor-maven-plugin - 1.5.8 - - - generate-docs - prepare-package - - process-asciidoc - - - html - book - - ${project.build.directory}/generated-snippets - - ${project.build.directory}/classes/rest-api - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - - diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/distributionsets-api-guide.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/distributionsets-api-guide.adoc deleted file mode 100644 index b0c39c6da6..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/distributionsets-api-guide.adoc +++ /dev/null @@ -1,892 +0,0 @@ -:doctype: book -:icons: font -:source-highlighter: highlightjs -:toc: macro -:toclevels: 1 -:sectlinks: -:linkattrs: - -[[distributionsets]] -= Distributionsets - -toc::[] - -== GET /rest/v1/distributionsets - -=== Implementation notes - -Handles the GET request of retrieving all distribution sets within Hawkbit. Required permission: READ_REPOSITORY - -=== Get paged list of Distribution Sets - -==== Curl - -include::{snippets}/distributionsets/get-distribution-sets/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/get-distribution-sets/http-request.adoc[] - -==== Request query parameter - -include::{snippets}/distributionsets/get-distribution-sets-with-parameters/request-parameters.adoc[] - -==== Request query parameter example - -include::{snippets}/distributionsets/get-distribution-sets-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsets/get-distribution-sets/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsets/get-distribution-sets/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/distributionsets - -=== Implementation Notes -Handles the POST request of creating new distribution sets within Hawkbit. The request body must always be a list of sets. Required permission: CREATE_REPOSITORY - -=== Create Distribution Sets - - -==== CURL - -include::{snippets}/distributionsets/create-distribution-sets/curl-request.adoc[] - - -==== Request URL - -include::{snippets}/distributionsets/create-distribution-sets/http-request.adoc[] - -==== Request fields - -include::{snippets}/distributionsets/create-distribution-sets/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsets/create-distribution-sets/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsets/create-distribution-sets/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/distributionsets/{distributionSetId} - - -=== Implementation Notes - -Handles the DELETE request for a single Distribution Set within Hawkbit. Required permission: DELETE_REPOSITORY - -=== Delete Distribution Set - -==== CURL - -include::{snippets}/distributionsets/delete-distribution-set/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/delete-distribution-set/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/delete-distribution-set/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/distributionsets/delete-distribution-set/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== GET /rest/v1/distributionsets/{distributionSetId} - -=== Implementation Notes - -Handles the GET request of retrieving a single distribution set within Hawkbit. Required permission: READ_REPOSITORY - -=== Get Distribution Set - -==== CURL - -include::{snippets}/distributionsets/get-distribution-set/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/get-distribution-set/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/get-distribution-set/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsets/get-distribution-set/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsets/get-distribution-set/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== PUT /rest/v1/distributionsets/{distributionSetId} - -=== Implementation Notes - -Handles the UPDATE request for a single Distribution Set within Hawkbit. Required permission: UPDATE_REPOSITORY - -=== Updating a Distribution Set - -==== Curl - -include::{snippets}/distributionsets/update-distribution-set/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/update-distribution-set/http-request.adoc[] - - -==== Request path parameter - -include::{snippets}/distributionsets/update-distribution-set/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/distributionsets/update-distribution-set/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsets/update-distribution-set/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsets/update-distribution-set/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== GET /rest/v1/distributionsets/{distributionSetId}/assignedSM - -=== Implementation Notes -Handles the GET request of retrieving a single distribution set within Hawkbit. Required permission: READ_REPOSITORY - -=== Get assigned Software Modules - -==== Curl - -include::{snippets}/distributionsets/get-assigned-software-modules/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/get-assigned-software-modules/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/get-assigned-software-modules/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/distributionsets/get-assigned-software-modules-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/distributionsets/get-assigned-software-modules-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsets/get-assigned-software-modules/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsets/get-assigned-software-modules/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/distributionsets/{distributionSetId}/assignedSM - -=== Implementation Notes - -Handles the POST request for assigning multiple software modules to a distribution set.The request body must always be a list of software module IDs. Required permissions: READ_REPOSITORY and UPDATE_REPOSITORY - -=== Assign Software Modules to Distribution Set - - -==== CURL - -include::{snippets}/distributionsets/assign-software-modules/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/assign-software-modules/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/assign-software-modules/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/distributionsets/assign-software-modules/request-fields.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/distributionsets/assign-software-modules/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== DELETE /rest/v1/distributionsets/{distributionSetId}/assignedSM/{softwareModuleId} - - -=== Implementation Notes - -Delete a assignment. Required permission: UPDATE_REPOSITORY - -=== Delete assignment of Software Module - -==== CURL - -include::{snippets}/distributionsets/delete-assign-software-modules/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/delete-assign-software-modules/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/delete-assign-software-modules/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/distributionsets/delete-assign-software-modules/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/distributionsets/{distributionSetId}/assignedTargets - - -=== Implementation Notes -Handles the GET request for retrieving assigned targets of a single distribution set. Required permissions: READ_REPOSITORY and READ_TARGET - -=== Get assigned targets - -==== Curl - -include::{snippets}/distributionsets/get-assigned-targets/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/get-assigned-targets/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/get-assigned-targets/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/distributionsets/get-assigned-targets-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/distributionsets/get-assigned-targets-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsets/get-assigned-targets/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsets/get-assigned-targets/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/distributionsets/{distributionSetId}/assignedTargets - - -=== Implementation Notes - -Handles the POST request for assigning multiple targets to a distribution set.The request body must always be a list of target IDs. Non-existing targets are silently ignored resulting in a valid response. Required permissions: READ_REPOSITORY and UPDATE_TARGET - -=== Assign targets to a distribution set - -==== CURL - -include::{snippets}/distributionsets/create-assigned-target/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/create-assigned-target/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/create-assigned-target/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/distributionsets/create-assigned-target/request-parameters.adoc[] - -==== Request fields - -include::{snippets}/distributionsets/create-assigned-target/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsets/create-assigned-target/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsets/create-assigned-target/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== GET /rest/v1/distributionsets/{distributionSetId}/installedTargets - -=== Implementation Notes - -Handles the GET request for retrieving installed targets of a single distribution set. Required permissions: READ_REPOSITORY and READ_TARGET - -=== Get installed targets - -==== Curl - -include::{snippets}/distributionsets/get-installed-targets/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/get-installed-targets/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/get-installed-targets/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/distributionsets/get-installed-targets-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/distributionsets/get-installed-targets-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsets/get-installed-targets/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsets/get-installed-targets/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/distributionsets/{distributionSetId}/autoAssignTargetFilters - -=== Implementation Notes - -Handles the GET request for retrieving assigned target filter queries of a single distribution set. Required permissions: READ_REPOSITORY and READ_TARGET - -=== Get installed targets - -==== Curl - -include::{snippets}/distributionsets/get-auto-assign-target-filter-queries/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/get-auto-assign-target-filter-queries/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/get-auto-assign-target-filter-queries/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/distributionsets/get-auto-assign-target-filter-queries-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/distributionsets/get-auto-assign-target-filter-queries-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsets/get-auto-assign-target-filter-queries/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsets/get-auto-assign-target-filter-queries/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/distributionsets/{distributionSetId}/metadata - -=== Implementation Notes - -Get a paged list of meta data for a distribution set. Required permission: READ_REPOSITORY - -=== Get a paged list of meta data - -==== Curl - -include::{snippets}/distributionsets/get-metadata/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/get-metadata/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/get-metadata/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/distributionsets/get-metadata-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/distributionsets/get-metadata-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsets/get-metadata/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsets/get-metadata/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /rest/v1/distributionsets/{distributionSetId}/metadata - -=== Implementation Notes - -Create a list of meta data entries Required permissions: READ_REPOSITORY and UPDATE_TARGET - -=== Create a list of meta data entries - - -==== CURL - -include::{snippets}/distributionsets/create-metadata/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/create-metadata/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/create-metadata/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/distributionsets/create-metadata/request-fields.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/distributionsets/create-metadata/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/distributionsets/{distributionSetId}/metadata/{metadataKey} - - -=== Implementation Notes - -Delete a single meta data. Required permission: UPDATE_REPOSITORY - -=== Delete a single meta data - -==== CURL - -include::{snippets}/distributionsets/delete-metadata/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/delete-metadata/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/delete-metadata/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/distributionsets/delete-metadata/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/distributionsets/{distributionSetId}/metadata/{metadataKey} - - -=== Implementation Notes - -Get a single meta data value for a meta data key. Required permission: READ_REPOSITORY - -=== Get a single meta data value - -==== Curl - -include::{snippets}/distributionsets/get-metadata-value/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/get-metadata-value/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/get-metadata-value/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsets/get-metadata-value/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsets/get-metadata-value/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== PUT /rest/v1/distributionsets/{distributionSetId}/metadata/{metadataKey} - - -=== Implementation Notes - -Update a single meta data value for speficic key. Required permission: UPDATE_REPOSITORY - -=== Update a single meta data value - -==== Curl - -include::{snippets}/distributionsets/update-metadata/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/update-metadata/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/update-metadata/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/distributionsets/update-metadata/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsets/update-metadata/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsets/update-metadata/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/distributionsets/{distributionSetId}/invalidate - - -=== Implementation Notes - -Invalidate a distribution set. -Once a distribution set is invalidated, it can not be valid again. -An invalidated distribution set cannot be assigned to targets anymore. -The distribution set that is going to be invalidated will be removed from all auto assignments. -Furthermore, the user can choose to cancel all rollouts and (force) cancel all actions connected to this distribution set. -Required permission: UPDATE_REPOSITORY, UPDATE_TARGET - -=== Invalidate a distribution set - -==== Curl - -include::{snippets}/distributionsets/invalidate/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsets/invalidate/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsets/invalidate/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/distributionsets/invalidate/request-fields.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/distributionsets/invalidate/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== Additional content - -[[error-body]] -=== Error body - -include::../errors/error-response-body.adoc[] - diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/distributionsettag-api-guide.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/distributionsettag-api-guide.adoc deleted file mode 100644 index 75a387900c..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/distributionsettag-api-guide.adoc +++ /dev/null @@ -1,438 +0,0 @@ -:doctype: book -:icons: font -:source-highlighter: highlightjs -:toc: macro -:toclevels: 1 -:sectlinks: -:linkattrs: - -[[distributionsettag]] -= Distribution set Tag - -toc::[] - - -== GET /rest/v1/distributionsettags - -=== Implementation notes - -Handles the GET request of retrieving all distribution set tags. - -=== Get paged list of distribution set tags - -==== CURL - -include::{snippets}/distributionsettag/get-distribution-set-tags/curl-request.adoc[] - -==== Request URL - -A `GET` request is used to access the distribution set tags. - -include::{snippets}/distributionsettag/get-distribution-set-tags/http-request.adoc[] - -==== Request query parameter - -include::{snippets}/distributionsettag/get-distribution-set-tags-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/distributionsettag/get-distribution-set-tags-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsettag/get-distribution-set-tags/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettag/get-distribution-set-tags/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/distributionsettags/{distributionsetTagId} - -=== Implementation notes - -Handles the GET request of retrieving a single distribution set tag. - -=== Get a single distribution set tag - -==== CURL - -include::{snippets}/distributionsettag/get-distribution-set-tag/curl-request.adoc[] - -==== Request URL - -A `GET` request is used to access the distribution set tag. - -include::{snippets}/distributionsettag/get-distribution-set-tag/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettag/get-distribution-set-tag/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsettag/get-distribution-set-tag/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettag/get-distribution-set-tag/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/distributionsettags - -=== Implementation Notes - -Handles the POST request of creating new distribution set tag. The request body must always be a list of distribution set tags. - -=== Create list of distribution set tags - -==== CURL - -include::{snippets}/distributionsettag/create-distribution-set-tags/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettag/create-distribution-set-tags/http-request.adoc[] - -==== Request fields - -include::{snippets}/distributionsettag/create-distribution-set-tags/request-fields.adoc[] - -=== Response (Status 201) - -==== Response fields - -include::{snippets}/distributionsettag/create-distribution-set-tags/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettag/create-distribution-set-tags/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== PUT /rest/v1/distributionsettags/{distributionsetTagId} - -=== Implementation Notes - -Handles the PUT request of updating a distribution set tag. - -=== Update a distribution set tag - -==== Curl - -include::{snippets}/distributionsettag/update-distribution-set-tag/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettag/update-distribution-set-tag/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettag/update-distribution-set-tag/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/distributionsettag/update-distribution-set-tag/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsettag/update-distribution-set-tag/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettag/update-distribution-set-tag/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/distributionsettags/{distributionsetTagId} - -=== Implementation Notes - -Handles the DELETE request of deleting a single distribution set tag. - -=== Deleting a distribution set tag - -==== CURL - -include::{snippets}/distributionsettag/delete-distribution-set-tag/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettag/delete-distribution-set-tag/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettag/delete-distribution-set-tag/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/distributionsettag/delete-distribution-set-tag/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/distributionsettags/{distributionsetTagId}/assigned - -=== Implementation Notes - -Handles the GET request of retrieving a list of assigned distributions. - -=== Get a list of assigned distributions - -==== CURL - -include::{snippets}/distributionsettag/get-assigned-distribution-sets/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettag/get-assigned-distribution-sets/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettag/get-assigned-distribution-sets/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsettag/get-assigned-distribution-sets/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettag/get-assigned-distribution-sets/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/distributionsettags/{distributionsetTagId}/assigned/toggleTagAssignment - -=== Implementation Notes - -Handles the POST request of toggle distribution assignment. -The request body must always be a list of distribution set ids. - -=== Toggle distribution assignment - -==== CURL - -include::{snippets}/distributionsettag/toggle-tag-assignment/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettag/toggle-tag-assignment/http-request.adoc[] - -==== Request fields - -include::{snippets}/distributionsettag/toggle-tag-assignment/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsettag/toggle-tag-assignment/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettag/toggle-tag-assignment/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/distributionsettags/{distributionsetTagId}/assigned - -=== Implementation Notes - -Handles the POST request of distribution assignment. Already assigned distribution will be ignored. - -=== Distribution assignment - -==== CURL - -include::{snippets}/distributionsettag/assign-distribution-sets/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettag/assign-distribution-sets/http-request.adoc[] - -==== Request fields - -include::{snippets}/distributionsettag/assign-distribution-sets/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsettag/assign-distribution-sets/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettag/assign-distribution-sets/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/distributionsettags/{distributionsetTagId}/assigned/{distributionsetId} - -=== Implementation Notes - -Handles the DELETE request of unassign the given distribution. - -=== Unassign a distribution - -==== CURL - -include::{snippets}/distributionsettag/unassign-distribution-set/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettag/unassign-distribution-set/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettag/unassign-distribution-set/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/distributionsettag/unassign-distribution-set/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== Additional content - -[[error-body]] -=== Error body - -include::../errors/error-response-body.adoc[] - - - diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/distributionsettypes-api-guide.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/distributionsettypes-api-guide.adoc deleted file mode 100644 index 26a45f2ec3..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/distributionsettypes-api-guide.adoc +++ /dev/null @@ -1,636 +0,0 @@ -:doctype: book -:icons: font -:source-highlighter: highlightjs -:toc: macro -:toclevels: 1 -:sectlinks: -:linkattrs: - -[[distributionset-types]] -= Distribution Set Types - -toc::[] - -== GET /rest/v1/distributionsettypes - -=== Implementation notes - -Handles the GET request of retrieving all distribution set types within Hawkbit. Required Permission: READ_REPOSITORY - -=== Get distribution set types - -==== CURL - -include::{snippets}/distributionsettypes/get-distribution-set-types/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettypes/get-distribution-set-types/http-request.adoc[] - -==== Request query parameter - -include::{snippets}/distributionsettypes/get-distribution-set-types-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/distributionsettypes/get-distribution-set-types-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsettypes/get-distribution-set-types/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettypes/get-distribution-set-types/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/distributionsettypes - -=== Implementation notes - -Handles the POST request for creating new distribution set types within Hawkbit. The request body must always be a list of types. Required Permission: CREATE_REPOSITORY - -=== Create distribution set types - -==== CURL - -include::{snippets}/distributionsettypes/post-distribution-set-types/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettypes/post-distribution-set-types/http-request.adoc[] - -==== Request fields - -include::{snippets}/distributionsettypes/post-distribution-set-types/request-fields.adoc[] - -=== Response (Status 201) - -==== Response fields - -include::{snippets}/distributionsettypes/post-distribution-set-types/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettypes/post-distribution-set-types/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Distribution set type was not found. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -| `409 Conflict` -| Distribution set type already exists -| See <> -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/distributionsettypes/{distributionSetTypeId} - -=== Implementation Notes - -Handles the DELETE request for a single distribution set type within Hawkbit. Required Permission: DELETE_REPOSITORY - -=== Delete distribution set type - -==== CURL - -include::{snippets}/distributionsettypes/delete-distribution-set-type/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettypes/delete-distribution-set-type/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettypes/delete-distribution-set-type/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/distributionsettypes/delete-distribution-set-type/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Distribution set type was not found. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/distributionsettypes/{distributionSetTypeId} - -=== Implementation notes - -Handles the GET request of retrieving a single distribution set type within Hawkbit. Required Permission: READ_REPOSITORY - -=== Get distribution set type - -==== CURL - -include::{snippets}/distributionsettypes/get-distribution-set-type/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettypes/get-distribution-set-type/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettypes/get-distribution-set-type/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsettypes/get-distribution-set-type/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettypes/get-distribution-set-type/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Distribution set type was not found. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== PUT /rest/v1/distributionsettypes/{distributionSetTypeId} - -=== Implementation notes - -Handles the PUT request for a single distribution set type within Hawkbit. Required Permission: UPDATE_REPOSITORY - -=== Update distribution set type - -==== CURL - -include::{snippets}/distributionsettypes/put-distribution-set-type/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettypes/put-distribution-set-type/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettypes/put-distribution-set-type/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/distributionsettypes/put-distribution-set-type/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsettypes/put-distribution-set-type/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettypes/put-distribution-set-type/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Distribution set type was not found. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/distributionsettypes/{distributionSetTypeId}/mandatorymoduletypes - -=== Implementation notes - -Handles the GET request of retrieving the list of mandatory software module types in that distribution set type. Required Permission: READ_REPOSITORY - -=== Lists all mandatory software module types - -==== CURL - -include::{snippets}/distributionsettypes/get-mandatory-modules/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettypes/get-mandatory-modules/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettypes/get-mandatory-modules/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsettypes/get-mandatory-modules/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettypes/get-mandatory-modules/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Distribution set type was not found. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/distributionsettypes/{distributionSetTypeId}/mandatorymoduletypes - -=== Implementation notes - -Handles the POST request for adding a mandatory software module type to a distribution set type.Note that a DS type cannot be changed after it has been used by a DS. Required Permission: UPDATE_REPOSITORY and READ_REPOSITORY - -=== Add mandatory software module type - -==== CURL - -include::{snippets}/distributionsettypes/post-mandatory-module/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettypes/post-mandatory-module/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettypes/post-mandatory-module/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/distributionsettypes/post-mandatory-module/request-fields.adoc[] - -=== Response (Status 201) - -==== Response example - -include::{snippets}/distributionsettypes/post-mandatory-module/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Distribution set type was not found. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -| `409 Conflict` -| Distribution set type already exists -| See <> -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/distributionsettypes/{distributionSetTypeId}/mandatorymoduletypes/{softwareModuleTypeId} - -=== Implementation Notes - -Handles the DELETE request for removing a software module type from a single distribution set type within Hawkbit. Required Permission: DELETE_REPOSITORY - -Delete mandatory software module type. - -=== Remove mandatory module from distribution set type - -==== CURL - -include::{snippets}/distributionsettypes/delete-mandatory-module/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettypes/delete-mandatory-module/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettypes/delete-mandatory-module/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/distributionsettypes/delete-mandatory-module/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Distribution set type was not found. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/distributionsettypes/{distributionSetTypeId}/mandatorymoduletypes/{softwareModuleTypeId} - -=== Implementation notes - -Handles the GET request of retrieving the single mandatory software module type in that distribution set type. Required Permission: READ_REPOSITORY - -=== Retrieve mandatory software module type - -==== CURL - -include::{snippets}/distributionsettypes/get-mandatory-module/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettypes/get-mandatory-module/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettypes/get-mandatory-module/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsettypes/get-mandatory-module/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettypes/get-mandatory-module/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Distribution set type was not found. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/distributionsettypes/{distributionSetTypeId}/optionalmoduletypes - -=== Implementation notes - -Handles the GET request of retrieving the list of optional software module types in that distribution set type. Required Permission: READ_REPOSITORY - -=== Lists all optional software module types - -==== CURL - -include::{snippets}/distributionsettypes/get-optional-modules/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettypes/get-optional-modules/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettypes/get-optional-modules/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsettypes/get-optional-modules/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettypes/get-optional-modules/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Distribution set type was not found. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /rest/v1/distributionsettypes/{distributionSetTypeId}/optionalmoduletypes - -=== Implementation notes - -Handles the POST request for adding an optional software module type to a distribution set type.Note that a DS type cannot be changed after it has been used by a DS. Required Permission: UPDATE_REPOSITORY and READ_REPOSITORY - -=== Add optional software module type - -==== CURL - -include::{snippets}/distributionsettypes/post-optional-module/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettypes/post-optional-module/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettypes/post-optional-module/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/distributionsettypes/post-optional-module/request-fields.adoc[] - -=== Response (Status 201) - -==== Response example - -include::{snippets}/distributionsettypes/post-optional-module/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Distribution set type was not found. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -| `409 Conflict` -| Distribution set type already exists -| See <> -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/distributionsettypes/{distributionSetTypeId}/optionalmoduletypes/{softwareModuleTypeId} - -=== Implementation Notes - -Handles DELETE request for removing an optional module from the distribution set type.Note that a DS type cannot be changed after it has been used by a DS. Required Permission: UPDATE_REPOSITORY and READ_REPOSITORY - -=== Remove optional module from distribution set type - -==== CURL - -include::{snippets}/distributionsettypes/delete-optional-module/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettypes/delete-optional-module/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettypes/delete-optional-module/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/distributionsettypes/delete-optional-module/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Distribution set type was not found. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/distributionsettypes/{distributionSetTypeId}/optionalmoduletypes/{softwareModuleTypeId} - -=== Implementation notes - -Handles the GET request of retrieving the single optional software module type in that distribution set type. Required Permission: READ_REPOSITORY - -=== Retrieve optional software module type - -==== CURL - -include::{snippets}/distributionsettypes/get-optional-module/curl-request.adoc[] - -==== Request URL - -include::{snippets}/distributionsettypes/get-optional-module/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/distributionsettypes/post-optional-module/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/distributionsettypes/get-optional-module/response-fields.adoc[] - -==== Response example - -include::{snippets}/distributionsettypes/get-optional-module/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Distribution set type was not found. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== Additional content - -[[error-body]] -=== Error body - -include::../errors/error-response-body.adoc[] \ No newline at end of file diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/rollout-api-guide.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/rollout-api-guide.adoc deleted file mode 100644 index ad91778d7e..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/rollout-api-guide.adoc +++ /dev/null @@ -1,585 +0,0 @@ -:doctype: book -:icons: font -:source-highlighter: highlightjs -:toc: macro -:toclevels: 1 -:sectlinks: -:linkattrs: - - - -[[rollouts]] -= Rollouts - -toc::[] - - -== GET /rest/v1/rollouts - -=== Implementation notes - -Handles the GET request of retrieving all rollouts within Hawkbit. Required Permission: READ_ROLLOUT - -=== Get paged list of Rollouts - -==== Curl - -include::{snippets}/rollouts/get-rollouts/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rollouts/get-rollouts/http-request.adoc[] - -==== Request query parameter - -include::{snippets}/rollouts/get-rollouts-with-parameters/request-parameters.adoc[] - -==== Request query parameter example - -include::{snippets}/rollouts/get-rollouts-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/rollouts/get-rollouts/response-fields.adoc[] - -==== Response example - -include::{snippets}/rollouts/get-rollouts/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== GET /rest/v1/rollouts/{rolloutId} - -=== Implementation Notes - -Handles the GET request of retrieving a single rollout within Hawkbit. Required Permission: READ_ROLLOUT - -=== Get Rollout - -==== CURL - -include::{snippets}/rollouts/get-rollout/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rollouts/get-rollout/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rollouts/get-rollout/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/rollouts/get-rollout/response-fields.adoc[] - -==== Response example - -include::{snippets}/rollouts/get-rollout/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /rest/v1/rollouts - -=== Implementation Notes -Handles the POST request of creating new rollout within Hawkbit. Required Permission: CREATE_ROLLOUT - -=== Create Rollout with defined amount of groups - - -==== CURL - -include::{snippets}/rollouts/create-rollout/curl-request.adoc[] - - -==== Request URL - -include::{snippets}/rollouts/create-rollout/http-request.adoc[] - -==== Request fields - -include::{snippets}/rollouts/create-rollout/request-fields.adoc[] - -=== Response (Status 201) - -==== Response fields - -include::{snippets}/rollouts/create-rollout/response-fields.adoc[] - -==== Response example - -include::{snippets}/rollouts/create-rollout/http-response.adoc[] - - -=== Create Rollout with groups definition - - -==== CURL - -include::{snippets}/rollouts/create-rollout-with-groups-definition/curl-request.adoc[] - - -==== Request URL - -include::{snippets}/rollouts/create-rollout-with-groups-definition/http-request.adoc[] - -==== Request fields - -include::{snippets}/rollouts/create-rollout-with-groups-definition/request-fields.adoc[] - -=== Response (Status 201) - -==== Response fields - -include::{snippets}/rollouts/create-rollout-with-groups-definition/response-fields.adoc[] - -==== Response example - -include::{snippets}/rollouts/create-rollout-with-groups-definition/http-response.adoc[] - - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /rest/v1/rollouts/{rolloutId}/approve - -=== Implementation Notes -Handles the POST request of approving a created rollout within Hawkbit. -Only possible if approval workflow is enabled in system configuration and rollout is in state WAITING_FOR_APPROVAL. -Required Permission: APPROVE_ROLLOUT - -=== Approve Rollout - -==== CURL - -include::{snippets}/rollouts/approve-rollout/curl-request.adoc[] - - -==== Request URL - -include::{snippets}/rollouts/approve-rollout/http-request.adoc[] - - -=== Response (Status 200) - -==== Response example - -include::{snippets}/rollouts/approve-rollout/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /rest/v1/rollouts/{rolloutId}/deny - -=== Implementation Notes -Handles the POST request of denying a created rollout within Hawkbit. -Only possible if approval workflow is enabled in system configuration and rollout is in state WAITING_FOR_APPROVAL. -Required Permission: APPROVE_ROLLOUT - -=== Deny Rollout - - -==== CURL - -include::{snippets}/rollouts/deny-rollout/curl-request.adoc[] - - -==== Request URL - -include::{snippets}/rollouts/deny-rollout/http-request.adoc[] - - -=== Response (Status 200) - -==== Response example - -include::{snippets}/rollouts/deny-rollout/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /rest/v1/rollouts/{rolloutId}/start - -=== Implementation Notes -Handles the POST request of starting a created rollout within Hawkbit. Required Permission: HANDLE_ROLLOUT - -=== Start Rollout - - -==== CURL - -include::{snippets}/rollouts/start-rollout/curl-request.adoc[] - - -==== Request URL - -include::{snippets}/rollouts/start-rollout/http-request.adoc[] - - -=== Response (Status 200) - -==== Response example - -include::{snippets}/rollouts/start-rollout/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /rest/v1/rollouts/{rolloutId}/pause - -=== Implementation Notes -Handles the POST request of pausing a running rollout within Hawkbit. Required Permission: HANDLE_ROLLOUT - -=== Pause Rollout - - -==== CURL - -include::{snippets}/rollouts/pause-rollout/curl-request.adoc[] - - -==== Request URL - -include::{snippets}/rollouts/pause-rollout/http-request.adoc[] - -==== Response example - -include::{snippets}/rollouts/pause-rollout/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /rest/v1/rollouts/{rolloutId}/resume - -=== Implementation Notes -Handles the POST request of resuming a paused rollout within Hawkbit. Required Permission: HANDLE_ROLLOUT - -=== Resume Rollout - - -==== CURL - -include::{snippets}/rollouts/resume-rollout/curl-request.adoc[] - - -==== Request URL - -include::{snippets}/rollouts/resume-rollout/http-request.adoc[] - -==== Response example - -include::{snippets}/rollouts/resume-rollout/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /rest/v1/rollouts/{rolloutId}/triggerNextGroup - -=== Implementation Notes -Handles the POST request of triggering the next group of a rollout within Hawkbit. Required Permission: UPDATE_ROLLOUT - -=== Trigger next group - - -==== CURL - -include::{snippets}/rollouts/trigger-next-group/curl-request.adoc[] - - -==== Request URL - -include::{snippets}/rollouts/trigger-next-group/http-request.adoc[] - -==== Response example - -include::{snippets}/rollouts/trigger-next-group/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== DELETE /rest/v1/rollouts/{rolloutId} - -=== Implementation Notes - -Handles the DELETE request of deleting a rollout within Hawkbit. Required Permission: DELETE_ROLLOUT - -=== Deleting a rollout - -==== CURL - -include::{snippets}/rollouts/delete-rollout/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rollouts/delete-rollout/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rollouts/delete-rollout/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/rollouts/delete-rollout/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== GET /rest/v1/rollouts/{rolloutId}/deploygroups - -=== Implementation Notes - -Handles the GET request of retrieving all deploy groups of a specific rollout within Hawkbit. Required Permission: READ_ROLLOUT - -=== Get Deploy Groups - -==== CURL - -include::{snippets}/rollouts/get-rollout-deploy-groups/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rollouts/get-rollout-deploy-groups/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rollouts/get-rollout-deploy-groups/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/rollouts/get-rollouts-with-parameters/request-parameters.adoc[] - -==== Request query parameter example - -include::{snippets}/rollouts/get-rollouts-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/rollouts/get-rollout-deploy-groups/response-fields.adoc[] - -==== Response example - -include::{snippets}/rollouts/get-rollout-deploy-groups/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== GET /rest/v1/rollouts/{rolloutId}/deploygroups/{deployGroupId} - -=== Implementation Notes - -Handles the GET request of a single deploy group of a specific rollout within Hawkbit. Required Permission: READ_ROLLOUT - -=== Get Deploy Groups - -==== CURL - -include::{snippets}/rollouts/get-rollout-deploy-group/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rollouts/get-rollout-deploy-group/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rollouts/get-rollout-deploy-group/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/rollouts/get-rollout-deploy-group/response-fields.adoc[] - -==== Response example - -include::{snippets}/rollouts/get-rollout-deploy-group/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== GET /rest/v1/rollouts/{rolloutId}/deploygroups/{deployGroupId}/targets - -=== Implementation Notes - -Handles the GET request of retrieving all targets of a single deploy group of a specific rollout within Hawkbit. Required Permissions: READ_ROLLOUT, READ_TARGET. - -=== Get Deploy Group Targets - -==== CURL - -include::{snippets}/rollouts/get-rollout-deploy-group-targets/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rollouts/get-rollout-deploy-group-targets/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rollouts/get-rollout-deploy-group-targets/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/rollouts/get-rollout-deploy-group-targets-with-parameters/request-parameters.adoc[] - -==== Request query parameter example - -include::{snippets}/rollouts/get-rollout-deploy-group-targets-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/rollouts/get-rollout-deploy-group-targets/response-fields.adoc[] - -==== Response example - -include::{snippets}/rollouts/get-rollout-deploy-group-targets/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== Additional content - -[[error-body]] -=== Error body - -include::../errors/error-response-body.adoc[] \ No newline at end of file diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/rootcontroller-api-guide.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/rootcontroller-api-guide.adoc deleted file mode 100644 index 724d3c8d70..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/rootcontroller-api-guide.adoc +++ /dev/null @@ -1,688 +0,0 @@ -:doctype: book -:icons: font -:source-highlighter: highlightjs -:toc: macro -:toclevels: 1 -:sectlinks: -:linkattrs: - -[[root-controller]] -= Root Controller - -toc::[] - -== GET /{tenant}/controller/v1/{controllerid} - -=== Implementation notes - -This base resource can be regularly polled by the controller on the provisioning target or device in order to retrieve actions that need to be executed. -Those are provided as a list of links to give more detailed information about the action. -Links are only available for initial configuration, open actions, or the latest installed action, respectively. -The resource supports Etag based modification checks in order to save traffic. - -Note: deployments have to be confirmed in order to move on to the next action. -Cancellations have to be confirmed or rejected. - -=== Controller base poll resource - -==== Curl - -include::{snippets}/rootcontroller/get-controller-base-with-open-deplyoment/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rootcontroller/get-controller-base-with-open-deplyoment/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rootcontroller/get-controller-base-with-open-deplyoment/path-parameters.adoc[] - -=== Response (Status 200) with an active deployment - -==== Response fields - -include::{snippets}/rootcontroller/get-controller-base-with-open-deplyoment/response-fields.adoc[] - -==== Response example - -include::{snippets}/rootcontroller/get-controller-base-with-open-deplyoment/http-response.adoc[] - -=== Response (Status 200) with an active cancellation - -==== Response fields - -include::{snippets}/rootcontroller/get-controller-base-with-open-deployment-cancellation/response-fields.adoc[] - -==== Response example - -include::{snippets}/rootcontroller/get-controller-base-with-open-deployment-cancellation/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403_quota.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /{tenant}/controller/v1/{controllerid}/cancelAction/{actionId} - -=== Implementation notes - -The Hawkbit server might cancel an operation, e.g. an unfinished update has a successor. It is up to the provisioning target to decide to accept the cancelation or reject it. - -=== Cancel an action - -==== Curl - -include::{snippets}/rootcontroller/get-controller-cancel-action/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rootcontroller/get-controller-cancel-action/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rootcontroller/get-controller-cancel-action/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/rootcontroller/get-controller-cancel-action/response-fields.adoc[] - -==== Response example - -include::{snippets}/rootcontroller/get-controller-cancel-action/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /{tenant}/controller/v1/{controllerid}/cancelAction/{actionId}/feedback - -=== Implementation notes - -It is up to the device how much intermediate feedback is provided. However, the action will be kept open until the controller on the device reports a finished (either successful or error) or rejects the action, e.g. the canceled actions have been started already. - -=== Feedback channel for cancel actions - -==== Curl - -include::{snippets}/rootcontroller/post-cancel-action-feedback/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rootcontroller/post-cancel-action-feedback/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rootcontroller/post-cancel-action-feedback/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/rootcontroller/post-cancel-action-feedback/request-fields.adoc[] - -=== Response (Status 200) - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== PUT /{tenant}/controller/v1/{controllerid}/configData - -=== Implementation notes - -The usual behaviour is that when a new device registers at the server it is requested to provide the meta information that will allow the server to identify the device on a hardware level (e.g. hardware revision, mac address, serial number etc.). - -=== Response to a requested metadata pull from the provisioning target device. - -==== Curl - -include::{snippets}/rootcontroller/put-config-data/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rootcontroller/put-config-data/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rootcontroller/put-config-data/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/rootcontroller/put-config-data/request-fields.adoc[] - -=== Response (Status 200) - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /{tenant}/controller/v1/{controllerid}/deploymentBase/{actionId} - -=== Implementation notes - -Core resource for deployment operations. Contains all information necessary in order to execute the operation. - -Keep in mind that the provided download links for the artifacts are generated dynamically by the update server. Host, port and path and not guaranteed to be similar to the provided examples below but will be defined at runtime. - -=== Deployment or update action - -==== Curl - -include::{snippets}/rootcontroller/get-controller-basedeployment-action/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rootcontroller/get-controller-basedeployment-action/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rootcontroller/get-controller-basedeployment-action/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/rootcontroller/get-controller-basedeployment-action/request-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/rootcontroller/get-controller-basedeployment-action/response-fields.adoc[] - -==== Response example - -In this case the (optional) query for the last 10 messages, previously provided by the device, are included. Useful if the devices provide state information previously on the feedback channel and won't store it locally. - -include::{snippets}/rootcontroller/get-controller-basedeployment-action/http-response.adoc[] - - -=== Response (Status 200) with a maintenance window defined but not active yet - -In addition to the straight forward approach to inform the device to download and install the software in one transaction hawkBit supports the separation of download and installation into separate steps. - -This feature is called Maintenance Window where the device is informed to download the software first and then when it enters a defined (maintenance) window the installation triggers follows as in the example above. - -==== Response example - -Note: artifact details not shown in this example. - -include::{snippets}/rootcontroller/get-controller-basedeployment-action-with-maintenance-window/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /{tenant}/controller/v1/{controllerid}/deploymentBase/{actionId}/feedback - - -=== Implementation notes - -Feedback channel. It is up to the device how much intermediate feedback is provided. However, the action will be kept open until the controller on the device reports a finished (either successful or error). - -=== Feedback channel for update action - -==== Curl - -include::{snippets}/rootcontroller/post-basedeployment-action-feedback/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rootcontroller/post-basedeployment-action-feedback/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rootcontroller/post-basedeployment-action-feedback/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/rootcontroller/post-basedeployment-action-feedback/request-fields.adoc[] - -=== Response (Status 200) - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/410.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== GET /{tenant}/controller/v1/{controllerid}/confirmationBase - -=== Implementation notes - -Core resource for confirmation related operations. While active actions awaiting confirmation will be referenced, the current auto-confirmation status will be shown. In case auto-confirmation is active, details like the initiator, remark and date of activation (as unix timestamp) will be provided. Reference links to switch the auto-confirmation state are exposed as well. - -=== Resource to request confirmation specific information for the controller - -==== Curl - -include::{snippets}/rootcontroller/get-confirmation-base-with-auto-confirm-active/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rootcontroller/get-confirmation-base-with-auto-confirm-active/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rootcontroller/get-confirmation-base-with-auto-confirm-active/path-parameters.adoc[] - -==== Response example (auto-confirmation is active) - -The response body in case auto-confirmation is active. - -include::{snippets}/rootcontroller/get-confirmation-base-with-auto-confirm-active/http-response.adoc[] - -==== Response example (auto-confirmation is not active) - -The response body references a link to activate auto-confirmation as well as a link to an open action waiting for confirmation (if present). - -include::{snippets}/rootcontroller/get-confirmation-base-with-auto-confirm-deactivated/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /{tenant}/controller/v1/{controllerid}/confirmationBase/activateAutoConfirm - -=== Implementation notes - -The device can use this resource to activate auto-confirmation. As a result all current active as well as future actions will automatically be confirmed by mentioning the initiator as triggered person. Actions will be automatically confirmed, as long as auto-confirmation is active. - -=== Interface to activate auto-confirmation for a specific device - -==== Curl - -include::{snippets}/rootcontroller/activate-auto-confirmation/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rootcontroller/activate-auto-confirmation/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rootcontroller/activate-auto-confirmation/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/rootcontroller/activate-auto-confirmation/request-fields.adoc[] - -=== Response (Status 200) - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /{tenant}/controller/v1/{controllerid}/confirmationBase/deactivateAutoConfirm - -=== Implementation notes - -The device can use this resource to deactivate auto-confirmation. All active actions will remain unchanged while all future actions need to be confirmed, before processing with the deployment. - -=== Interface to deactivate auto-confirmation for a specific controller - -==== Curl - -include::{snippets}/rootcontroller/deactivate-auto-confirmation/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rootcontroller/deactivate-auto-confirmation/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rootcontroller/deactivate-auto-confirmation/path-parameters.adoc[] - -=== Response (Status 200) - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== GET /{tenant}/controller/v1/{controllerid}/confirmationBase/{actionId} - -=== Implementation notes - -Resource to receive information about a pending confirmation. -The response will be of the same format as the deploymentBase operation. -The controller should provide feedback about the confirmation first, before processing the deployment. - -Keep in mind that the provided download links for the artifacts are generated dynamically by the update server. -Host, port and path are not guaranteed to be similar to the provided examples below but will be defined at runtime. - -=== Confirmation status of an action - -==== Curl - -include::{snippets}/rootcontroller/get-confirmation-base-action/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rootcontroller/get-confirmation-base-action/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rootcontroller/get-confirmation-base-action/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/rootcontroller/get-confirmation-base-action/request-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/rootcontroller/get-confirmation-base-action/response-fields.adoc[] - -==== Response example - -The response body includes the detailed information about the action awaiting confirmation in the same format as for the deploymentBase operation. - -include::{snippets}/rootcontroller/get-confirmation-base-action/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404_target_action.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /{tenant}/controller/v1/{controllerid}/confirmationBase/{actionId}/feedback - -=== Implementation notes - -The device will use this resource to either confirm or deny an action which is waiting for confirmation. The action will be transferred into the RUNNING state in case the device is confirming it. Afterwards it will be exposed by the deploymentBase. - -=== Feedback channel for actions waiting for confirmation - -==== Curl - -include::{snippets}/rootcontroller/post-confirmation-feedback/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rootcontroller/post-confirmation-feedback/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rootcontroller/post-confirmation-feedback/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/rootcontroller/post-confirmation-feedback/request-fields.adoc[] - -=== Response (Status 200) - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404_target_action.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/410.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== GET /{tenant}/controller/v1/{controllerid}/installedBase/{actionId} - -=== Implementation notes - -Resource to receive information of the previous installation. -Can be used to re-retrieve artifacts of the already finished action, for example in case a re-installation is necessary. -The response will be of the same format as the deploymentBase operation, providing the previous action that has been finished successfully. -As the action is already finished, no further feedback is expected. - -Keep in mind that the provided download links for the artifacts are generated dynamically by the update server. -Host, port and path are not guaranteed to be similar to the provided examples below but will be defined at runtime. - -=== Previously installed action - -==== Curl - -include::{snippets}/rootcontroller/get-controller-installed-base-action/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rootcontroller/get-controller-installed-base-action/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rootcontroller/get-controller-installed-base-action/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/rootcontroller/get-controller-installed-base-action/request-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/rootcontroller/get-controller-installed-base-action/response-fields.adoc[] - -==== Response example - -The response body includes the detailed operation for the already finished action in the same format as for the deploymentBase operation. - -In this case the (optional) query for the last 10 messages, previously provided by the device, are included. - -include::{snippets}/rootcontroller/get-controller-installed-base-action/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -//// -== GET /{tenant}/controller/v1/{controllerid}/softwaremodules - -=== Implementation notes - -Returns all available software modules for a given target - -=== Returns software modules of given target - -==== Curl - -include::{snippets}/rootcontroller/get-software-modules/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rootcontroller/get-software-modules/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rootcontroller/get-software-modules/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/rootcontroller/get-software-modules/response-fields.adoc[] - -==== Response example - -include::{snippets}/rootcontroller/get-software-modules/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== -//// - -== GET /{tenant}/controller/v1/{controllerid}/softwaremodules/{softwareModuleId}/artifacts - -=== Implementation notes - -Returns all artifacts that are assigned to the software module - -=== Returns artifacts of given software module - -==== Curl - -include::{snippets}/rootcontroller/get-software-modules-artifacts/curl-request.adoc[] - -==== Request URL - -include::{snippets}/rootcontroller/get-software-modules-artifacts/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/rootcontroller/get-software-modules-artifacts/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/rootcontroller/get-software-modules-artifacts/response-fields.adoc[] - -==== Response example - -include::{snippets}/rootcontroller/get-software-modules-artifacts/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== Additional content - -[[error-body]] -=== Error body - -include::../errors/error-response-body.adoc[] \ No newline at end of file diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/softwaremodules-api-guide.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/softwaremodules-api-guide.adoc deleted file mode 100644 index 3b6c9368b3..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/softwaremodules-api-guide.adoc +++ /dev/null @@ -1,756 +0,0 @@ -:doctype: book -:icons: font -:source-highlighter: highlightjs -:toc: macro -:toclevels: 1 -:sectlinks: -:linkattrs: - -[[software-modules]] -= Software Modules - -toc::[] - -== GET /rest/v1/softwaremodules - -=== Implementation notes - -Handles the GET request of retrieving all softwaremodules within Hawkbit. Required Permission: READ_REPOSITORY - -=== Get software modules - -==== CURL - -include::{snippets}/softwaremodules/get-software-modules/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/get-software-modules/http-request.adoc[] - -==== Request parameter - -include::{snippets}/softwaremodules/get-software-modules-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/softwaremodules/get-software-modules-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/softwaremodules/get-software-modules/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremodules/get-software-modules/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/softwaremodules - -=== Implementation notes - -Handles the POST request of creating new software modules within Hawkbit. The request body must always be a list of modules. Required Permission: CREATE_REPOSITORY - -=== Create software modules - -==== CURL - -include::{snippets}/softwaremodules/post-software-modules/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/post-software-modules/http-request.adoc[] - -==== Request fields - -include::{snippets}/softwaremodules/post-software-modules/request-fields.adoc[] - -=== Response (Status 201) - -==== Response fields - -include::{snippets}/softwaremodules/post-software-modules/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremodules/post-software-modules/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/softwaremodules/{softwareModuleId} - -=== Implementation Notes - -Handles the DELETE request for a single softwaremodule within Hawkbit. Required Permission: DELETE_REPOSITORY - -=== Delete software module - -==== CURL - -include::{snippets}/softwaremodules/delete-software-module/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/delete-software-module/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremodules/delete-software-module/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/softwaremodules/delete-software-module/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/softwaremodules/{softwareModuleId} - -=== Implementation notes - -Handles the GET request of retrieving a single softwaremodule within Hawkbit. Required Permission: READ_REPOSITORY - -=== Get software module - -==== CURL - -include::{snippets}/softwaremodules/get-software-module/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/get-software-module/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremodules/get-software-module/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/softwaremodules/get-software-module/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremodules/get-software-module/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== PUT /rest/v1/softwaremodules/{softwareModuleId} - -=== Implementation notes - -Handles the PUT request for a single softwaremodule within Hawkbit. Required Permission: UPDATE_REPOSITORY - -=== Update software module - -==== CURL - -include::{snippets}/softwaremodules/put-software-module/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/put-software-module/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremodules/put-software-module/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/softwaremodules/put-software-module/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/softwaremodules/put-software-module/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremodules/put-software-module/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/softwaremodules/{softwareModuleId}/artifacts - -=== Implementation notes - -Handles the GET request of retrieving all meta data of artifacts assigned to a software module. Required Permission: READ_REPOSITORY - -=== List artifacts metadata - -==== CURL - -include::{snippets}/softwaremodules/get-artifacts/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/get-artifacts/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremodules/get-artifacts/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/softwaremodules/get-artifacts-with-parameters/request-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/softwaremodules/get-artifacts/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremodules/get-artifacts/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/softwaremodules/{softwareModuleId}/artifacts - -=== Implementation notes - -Handles POST request for artifact upload. Required Permission: CREATE_REPOSITORY - -=== Upload artifact - -==== CURL - -include::{snippets}/softwaremodules/post-artifact/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/post-artifact/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremodules/post-artifact/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/softwaremodules/post-artifact-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/softwaremodules/post-artifact-with-parameters/http-request.adoc[] - -=== Response (Status 201) - -==== Response fields - -include::{snippets}/softwaremodules/post-artifact/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremodules/post-artifact/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/softwaremodules/{softwareModuleId}/artifacts/{artifactId} - -=== Implementation Notes - -Handles the DELETE request for a single SoftwareModule within Hawkbit. Required Permission: DELETE_REPOSITORY - -=== Delete arifact - -==== CURL - -include::{snippets}/softwaremodules/delete-artifact/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/delete-artifact/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremodules/delete-artifact/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/softwaremodules/delete-artifact/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/softwaremodules/{softwareModuleId}/artifacts/{artifactId} - -=== Implementation notes - -Handles the GET request of retrieving a single Artifact meta data request. Required Permission: READ_REPOSITORY - -=== Get artifact metadata - -==== CURL - -include::{snippets}/softwaremodules/get-artifact/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/get-artifact/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremodules/get-artifact/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/softwaremodules/get-artifact-with-parameters/request-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/softwaremodules/get-artifact/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremodules/get-artifact/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/softwaremodules/{softwareModuleId}/artifacts/{artifactId}/download - -=== Implementation notes - -Handles the GET request for downloading an artifact. Required Permission: READ_REPOSITORY - -=== Download artifact - -==== CURL - -include::{snippets}/softwaremodules/get-download-artifact/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/get-download-artifact/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremodules/get-download-artifact/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/softwaremodules/get-download-artifact/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -| `410 Gone` -| The resource does not exist anymore. The software module might be soft deleted. -| -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/softwaremodules/{softwareModuleId}/metadata - -=== Implementation notes - -Get a paged list of meta data for a software module. Required Permission: READ_REPOSITORY - -=== Get a paged list of metadata - -==== CURL - -include::{snippets}/softwaremodules/get-metadata/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/get-metadata/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremodules/get-metadata/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/softwaremodules/get-metadata-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/softwaremodules/get-metadata-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/softwaremodules/get-metadata/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremodules/get-metadata/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/softwaremodules/{softwareModuleId}/metadata - -=== Implementation notes - -Create a list of meta data entries Required Permission: UPDATE_REPOSITORY - -=== Create a list of metadata entries - -==== CURL - -include::{snippets}/softwaremodules/post-metadata/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/post-metadata/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremodules/post-metadata/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/softwaremodules/post-metadata/request-fields.adoc[] - -=== Response (Status 201) - -==== Response fields - -include::{snippets}/softwaremodules/post-metadata/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremodules/post-metadata/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== DELETE /rest/v1/softwaremodules/{softwareModuleId}/metadata/{metadataKey} - -=== Implementation Notes - -Delete a single meta data. Required Permission: UPDATE_REPOSITORY - -=== Deleting a single metadata - -==== CURL - -include::{snippets}/softwaremodules/delete-metadata/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/delete-metadata/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremodules/delete-metadata/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/softwaremodules/delete-metadata/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/softwaremodules/{softwareModuleId}/metadata/{metadataKey} - -=== Implementation notes - -Get a single meta data value for a meta data key. Required Permission: READ_REPOSITORY - -=== Get a single metadata value - -==== CURL - -include::{snippets}/softwaremodules/get-metadata-value/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/get-metadata-value/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremodules/get-metadata-value/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/softwaremodules/get-metadata-value/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremodules/get-metadata-value/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== PUT /rest/v1/softwaremodules/{softwareModuleId}/metadata/{metadataKey} - -=== Implementation notes - -Update a single meta data value for speficic key. Required Permission: UPDATE_REPOSITORY - -=== Updating a single metadata value - -==== CURL - -include::{snippets}/softwaremodules/put-metadata/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremodules/put-metadata/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremodules/put-metadata/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/softwaremodules/put-metadata/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/softwaremodules/put-metadata/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremodules/put-software-module/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== Additional content - -[[error-body]] -=== Error body - -include::../errors/error-response-body.adoc[] - - diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/softwaremoduletypes-api-guide.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/softwaremoduletypes-api-guide.adoc deleted file mode 100644 index 97249b5a3b..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/softwaremoduletypes-api-guide.adoc +++ /dev/null @@ -1,255 +0,0 @@ -:doctype: book -:icons: font -:source-highlighter: highlightjs -:toc: macro -:toclevels: 1 -:sectlinks: -:linkattrs: - -[[software-module-types]] -= Software Module Types - -toc::[] - -== GET /rest/v1/softwaremoduletypes - -=== Implementation notes - -Handles the GET request of retrieving all software module types within Hawkbit. Required Permission: READ_REPOSITORY - -=== Get software module types - -==== CURL - -include::{snippets}/softwaremoduletypes/get-software-module-types/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremoduletypes/get-software-module-types/http-request.adoc[] - -==== Request query parameter - -include::{snippets}/softwaremoduletypes/get-software-module-types-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/softwaremoduletypes/get-software-module-types-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/softwaremoduletypes/get-software-module-types/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremoduletypes/get-software-module-types/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/softwaremoduletypes - -=== Implementation notes - -Handles the POST request of creating new software module types within Hawkbit. The request body must always be a list of module types. Required Permission: CREATE_REPOSITORY - -=== Creating software module types - -==== CURL - -include::{snippets}/softwaremoduletypes/post-software-module-types/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremoduletypes/post-software-module-types/http-request.adoc[] - -==== Request fields - -include::{snippets}/softwaremoduletypes/post-software-module-types/request-fields.adoc[] - -=== Response (Status 201) - -==== Response fields - -include::{snippets}/softwaremoduletypes/post-software-module-types/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremoduletypes/post-software-module-types/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module Type. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/softwaremoduletypes/{softwareModuleTypeId} - -=== Implementation Notes - -Handles the DELETE request for a single software module type within Hawkbit. Required Permission: DELETE_REPOSITORY - -=== Delete software module type - -==== CURL - -include::{snippets}/softwaremoduletypes/delete-software-module-type/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremoduletypes/delete-software-module-type/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremoduletypes/delete-software-module-type/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/softwaremoduletypes/delete-software-module-type/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/softwaremoduletypes/{softwareModuleTypeId} - -=== Implementation notes - -Handles the GET request of retrieving a single software module type within Hawkbit. Required Permission: READ_REPOSITORY - -=== Accessing a software module type - -==== CURL - -include::{snippets}/softwaremoduletypes/get-software-module-type/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremoduletypes/get-software-module-type/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremoduletypes/get-software-module-type/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/softwaremoduletypes/get-software-module-type/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremoduletypes/get-software-module-type/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== PUT /rest/v1/softwaremoduletypes/{softwareModuleTypeId} - -=== Implementation notes - -Handles the PUT request for a single software module type within Hawkbit. Required Permission: UPDATE_REPOSITORY - -=== Updating a software module types - -==== CURL - -include::{snippets}/softwaremoduletypes/put-software-module-type/curl-request.adoc[] - -==== Request URL - -include::{snippets}/softwaremoduletypes/put-software-module-type/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/softwaremoduletypes/put-software-module-type/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/softwaremoduletypes/put-software-module-type/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/softwaremoduletypes/put-software-module-type/response-fields.adoc[] - -==== Response example - -include::{snippets}/softwaremoduletypes/put-software-module-type/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -| `404 Not Found` -| Not Found Software Module Type. -| See <> -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== Additional content - -[[error-body]] -=== Error body - -include::../errors/error-response-body.adoc[] - diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/targetfilters-api-guide.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/targetfilters-api-guide.adoc deleted file mode 100644 index 2c4d48f140..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/targetfilters-api-guide.adoc +++ /dev/null @@ -1,392 +0,0 @@ -:doctype: book -:icons: font -:source-highlighter: highlightjs -:toc: macro -:toclevels: 1 -:sectlinks: -:linkattrs: - -[[targetfilters]] -= Target filter queries - -toc::[] - - -== GET /rest/v1/targetfilters - -=== Implementation notes - -Handles the GET request of retrieving all target filter queries within Hawkbit. Required permission: READ_TARGET - -=== Get paged list of target filter queries - -==== CURL - -include::{snippets}/targetfilters/get-target-filter-queries/curl-request.adoc[] - -==== Request URL - -A `GET` request is used to access the target filter queries - -include::{snippets}/targetfilters/get-target-filter-queries/http-request.adoc[] - -==== Request query parameter - -include::{snippets}/targetfilters/get-target-filter-queries-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/targetfilters/get-target-filter-queries-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targetfilters/get-target-filter-queries/response-fields.adoc[] - -==== Response example - -include::{snippets}/targetfilters/get-target-filter-queries/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/targetfilters - -=== Implementation Notes - -Handles the POST request to create a new target filter query within Hawkbit. Required permission: CREATE_TARGET - -=== Create a target filter query - -==== CURL - -include::{snippets}/targetfilters/post-target-filter-query/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targetfilters/post-target-filter-query/http-request.adoc[] - -==== Request fields - -include::{snippets}/targetfilters/post-target-filter-query/request-fields.adoc[] - -=== Response (Status 201) - -==== Response fields - -include::{snippets}/targetfilters/post-target-filter-query/response-fields.adoc[] - -==== Response example - -include::{snippets}/targetfilters/post-target-filter-query/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403_quota.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/targetfilters/{targetFilterQueryId} - -=== Implementation Notes - -Handles the DELETE request of deleting a target filter query within Hawkbit. Required permission: DELETE_TARGET - -=== Deleting a target - -==== CURL - -include::{snippets}/targetfilters/delete-target-filter-query/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targetfilters/delete-target-filter-query/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targetfilters/delete-target-filter-query/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/targetfilters/delete-target-filter-query/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/targetfilters/{targetFilterQueryId} - -=== Implementation Notes - -Handles the GET request of retrieving a single target filter query within Hawkbit. Required permission: READ_TARGET - -=== Get single target - -==== CURL - -include::{snippets}/targetfilters/get-target-filter-query/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targetfilters/get-target-filter-query/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targetfilters/get-target-filter-query/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targetfilters/get-target-filter-query/response-fields.adoc[] - -==== Response example - -include::{snippets}/targetfilters/get-target-filter-query/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== PUT /rest/v1/targetfilters/{targetFilterQueryId} - -=== Implementation Notes - -Handles the PUT request of updating a target filter query within Hawkbit. Required permission: UPDATE_TARGET - -=== Update a target - -==== Curl - -include::{snippets}/targetfilters/put-target-filter-query/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targetfilters/put-target-filter-query/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targetfilters/put-target-filter-query/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/targetfilters/put-target-filter-query/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targetfilters/put-target-filter-query/response-fields.adoc[] - -==== Response example - -include::{snippets}/targetfilters/put-target-filter-query/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/targetfilters/{targetFilterQueryId}/autoAssignDS - -=== Implementation Notes - -Handles the GET request of retrieving the auto assign distribution set. Required permission: READ_TARGET - -=== Get auto assign distribution set - -==== Curl - -include::{snippets}/targetfilters/get-assign-ds/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targetfilters/get-assign-ds/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targetfilters/get-assign-ds/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targetfilters/get-assign-ds/response-fields.adoc[] - -==== Response example - -include::{snippets}/targetfilters/get-assign-ds/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/targetfilters/{targetFilterQueryId}/autoAssignDS - -=== Implementation Notes - -Handles the POST request of setting the auto assign distribution set for a target filter query. -Required permissions: UPDATE_TARGET and READ_REPOSITORY - -=== Set auto assign distribution set - -==== Curl - -include::{snippets}/targetfilters/post-auto-assign-ds/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targetfilters/post-auto-assign-ds/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targetfilters/post-auto-assign-ds/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/targetfilters/post-auto-assign-ds/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targetfilters/post-auto-assign-ds/response-fields.adoc[] - -==== Response example - -include::{snippets}/targetfilters/post-auto-assign-ds/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/targetfilters/{targetFilterQueryId}/autoAssignDS - -=== Implementation Notes - -Removes the auto assign distribution set from the target filter query. Required permission: UPDATE_TARGET - -=== Removing the auto assign distribution set - -==== Curl - -include::{snippets}/targetfilters/delete-auto-assign-ds/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targetfilters/delete-auto-assign-ds/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targetfilters/delete-auto-assign-ds/path-parameters.adoc[] - -=== Response (Status 204) - -==== Response example - -include::{snippets}/targetfilters/delete-auto-assign-ds/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - - -== Additional content - -[[error-body]] -=== Error body - -include::../errors/error-response-body.adoc[] - - diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/targets-api-guide.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/targets-api-guide.adoc deleted file mode 100644 index 571a1ed4b2..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/targets-api-guide.adoc +++ /dev/null @@ -1,1212 +0,0 @@ -:doctype: book -:icons: font -:source-highlighter: highlightjs -:toc: macro -:toclevels: 1 -:sectlinks: -:linkattrs: - -[[targets]] -= Targets - -toc::[] - - -== GET /rest/v1/targets - -=== Implementation notes - -Handles the GET request of retrieving all targets within Hawkbit. Required permission: READ_TARGET - -=== Get paged list of targets - -==== CURL - -include::{snippets}/targets/get-targets/curl-request.adoc[] - -==== Request URL - -A `GET` request is used to access the targets - -include::{snippets}/targets/get-targets/http-request.adoc[] - -==== Request query parameter - -include::{snippets}/targets/get-targets-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/targets/get-targets-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targets/get-targets/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/get-targets/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/targets - -=== Implementation Notes - -Handles the POST request of creating new targets within Hawkbit. The request body must always be a list of targets. Required Permission: CREATE_TARGET - -=== Create list of targets - -==== CURL - -include::{snippets}/targets/post-targets/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/post-targets/http-request.adoc[] - -==== Request fields - -include::{snippets}/targets/post-targets/request-fields.adoc[] - -=== Response (Status 201) - -==== Response fields - -include::{snippets}/targets/post-targets/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/post-targets/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403_quota.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/targets/{targetId} - -=== Implementation Notes - -Handles the DELETE request of deleting a single target within Hawkbit. Required Permission: DELETE_TARGET - -=== Deleting a target - -==== CURL - -include::{snippets}/targets/delete-target/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/delete-target/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/delete-target/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/targets/delete-target/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/targets/{targetId} - -=== Implementation Notes - -Handles the GET request of retrieving a single target within Hawkbit. Required Permission: READ_TARGET - -=== Get single target - -==== CURL - -include::{snippets}/targets/get-target/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/get-target/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/get-target/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targets/get-target/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/get-target/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== PUT /rest/v1/targets/{targetId} - -=== Implementation Notes - -Handles the PUT request of updating a target within Hawkbit. Required Permission: UPDATE_TARGET - -=== Update a target - -==== Curl - -include::{snippets}/targets/put-target/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/put-target/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/put-target/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/targets/put-target/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targets/put-target/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/put-target/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/targets/{targetId}/autoConfirm - -=== Implementation Notes - -Handles the GET request to check the current auto-confirmation state of a target. Required Permission: READ_TARGET - -=== Request auto-confirmation state for a specific target - -==== Curl - -include::{snippets}/targets/get-target-auto-confirm-state-active/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/get-target-auto-confirm-state-active/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/get-target-auto-confirm-state-active/path-parameters.adoc[] - -=== Response in case auto-confirmation is active (Status 200) - -In case auto-confirmation is active, details like the initiator, remark and date of activation (as unix timestamp) will be provided. Reference links to switch the auto-confirmation state are exposed as well. - -==== Response fields - -include::{snippets}/targets/get-target-auto-confirm-state-active/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/get-target-auto-confirm-state-active/http-response.adoc[] - -=== Response in case auto-confirmation is not active (Status 200) - -The response body references a link to activate auto-confirmation. - -==== Response fields - -include::{snippets}/targets/get-target-auto-confirm-state-not-active/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/get-target-auto-confirm-state-not-active/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/targets/{targetId}/autoConfirm/activate - -=== Implementation Notes - -Handles the POST request to activate auto-confirmation for a specific target. -As a result all current active as well as future actions will automatically be confirmed by mentioning the initiator as triggered person. -Actions will be automatically confirmed, as long as auto-confirmation is active. -Required Permission: UPDATE_TARGET - -=== Activate auto-confirmation for a target - -==== Curl - -include::{snippets}/targets/post-activate-auto-confirm/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/post-activate-auto-confirm/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/post-activate-auto-confirm/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/targets/post-activate-auto-confirm/request-fields.adoc[] - -=== Response (Status 200) - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/targets/{targetId}/autoConfirm/deactivate - -=== Implementation Notes - -Handles the POST request to deactivate auto-confirmation for a specific target. -All active actions will remain unchanged while all future actions need to be confirmed, before processing with the deployment. -Required Permission: UPDATE_TARGET - -=== Deactivate auto-confirmation for a target - -==== Curl - -include::{snippets}/targets/post-deactivate-auto-confirm/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/post-deactivate-auto-confirm/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/post-deactivate-auto-confirm/path-parameters.adoc[] - -=== Response (Status 200) - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/targets/{targetId}/actions - -=== Implementation Notes - -Handles the GET request of retrieving the full action history of a specific target. Required Permission: READ_TARGET - -=== List all actions of Target - -==== Curl - -include::{snippets}/targets/get-actions-from-target/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/get-actions-from-target/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/get-actions-from-target/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/targets/get-actions-from-target-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/targets/get-actions-from-target-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targets/get-actions-from-target-with-maintenance-window/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/get-actions-from-target/http-response.adoc[] - -==== Response example with Maintenance Window - -include::{snippets}/targets/get-actions-from-target-with-maintenance-window/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== PUT /rest/v1/targets/{targetId}/actions/{actionId} - -=== Implementation Notes - -Handles the PUT request to switch an action from soft to forced. Required Permission: UPDATE_TARGET. - -=== Update a target - -==== Curl - -include::{snippets}/targets/switch-action-to-forced/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/switch-action-to-forced/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/switch-action-to-forced/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/targets/switch-action-to-forced/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targets/switch-action-to-forced/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/switch-action-to-forced/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== DELETE /rest/v1/targets/{targetId}/actions/{actionId} - -=== Implementation Notes - -Cancels an active action, only active actions can be deleted. Required Permission: UPDATE_TARGET - -=== Canceling an active action - -==== Curl - -include::{snippets}/targets/delete-action-from-target/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/delete-action-from-target/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/delete-action-from-target/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/targets/delete-action-from-target-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/targets/delete-action-from-target-with-parameters/http-request.adoc[] - -=== Response (Status 204) - -==== Response example - -include::{snippets}/targets/delete-action-from-target/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/targets/{targetId}/actions/{actionId} - -=== Implementation Notes - -Handles the GET request of retrieving a specific action on a specific target. Required Permission: READ_TARGET - -=== Get assigned action of target - -==== Curl - -include::{snippets}/targets/get-action-from-target/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/get-action-from-target/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/get-action-from-target/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targets/get-action-from-target-with-maintenance-window/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/get-action-from-target/http-response.adoc[] - -==== Response example with Maintenance Window - -include::{snippets}/targets/get-action-from-target-with-maintenance-window/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/targets/{targetId}/actions/{actionId}/status - -=== Implementation Notes - -Handles the GET request of retrieving a specific action on a specific target. Required Permission: READ_TARGET - -=== Get statuses of assigned action - -==== Curl - -include::{snippets}/targets/get-status-from-action/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/get-status-from-action/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/get-status-from-action/path-parameters.adoc[] - -==== Request parameter - -include::{snippets}/targets/get-status-from-action-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/targets/get-status-from-action-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targets/get-status-from-action/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/get-status-from-action/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/targets/{targetId}/assignedDS - -=== Implementation Notes - -Handles the GET request of retrieving the assigned distribution set of an specific target. Required Permission: READ_TARGET - -=== Get assigned distribution set of target - -==== Curl - -include::{snippets}/targets/get-assigned-distribution-set-from-action/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/get-assigned-distribution-set-from-action/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/get-assigned-distribution-set-from-action/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targets/get-assigned-distribution-set-from-action/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/get-assigned-distribution-set-from-action/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/targets/{targetId}/assignedDS (assign single distribution set) - -=== Implementation Notes - -Handles the POST request for assigning a distribution set to a specific target. Required Permission: READ_REPOSITORY and UPDATE_TARGET - -=== Assign distribution set to target - -==== Curl - -include::{snippets}/targets/post-assign-distribution-set-to-target/curl-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/post-assign-distribution-set-to-target/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/targets/post-assign-distribution-set-to-target/request-parameters.adoc[] - -==== Request fields - -include::{snippets}/targets/post-assign-distribution-set-to-target/request-fields.adoc[] - -==== Request URL - -include::{snippets}/targets/post-assign-distribution-set-to-target/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields -include::{snippets}/targets/post-assign-distribution-set-to-target/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/post-assign-distribution-set-to-target/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/targets/{targetId}/assignedDS (assign multiple distribution sets) - -=== Implementation Notes - -Handles the POST request for assigning multiple distribution sets to a specific target (only allowed id 'multi assignments' is enabled). Required Permission: READ_REPOSITORY and UPDATE_TARGET - -=== Assign distribution sets to target - -==== Curl - -include::{snippets}/targets/post-assign-distribution-sets-to-target/curl-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/post-assign-distribution-sets-to-target/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/targets/post-assign-distribution-sets-to-target/request-parameters.adoc[] - -==== Request fields - -include::{snippets}/targets/post-assign-distribution-sets-to-target/request-fields.adoc[] - -==== Request URL - -include::{snippets}/targets/post-assign-distribution-sets-to-target/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields -include::{snippets}/targets/post-assign-distribution-sets-to-target/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/post-assign-distribution-sets-to-target/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400_multiassignment.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/targets/{targetId}/attributes - -=== Implementation Notes - -Handles the GET request of retrieving the attributes of a specific target. Reponse is a key/value list. Required Permission: READ_TARGET - -=== Get attributes of target - -==== Curl - -include::{snippets}/targets/get-controller-attributes/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/get-controller-attributes/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/get-controller-attributes/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/targets/get-controller-attributes/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/targets/{targetId}/installedDS - -=== Implementation Notes - -Handles the GET request of retrieving the installed distribution set of an specific target. Required Permission: READ_TARGET - -=== Get installed distribution set of target - -==== Curl - -include::{snippets}/targets/get-installed-distribution-set-from-target/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/get-installed-distribution-set-from-target/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/get-installed-distribution-set-from-target/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targets/get-installed-distribution-set-from-target/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/get-installed-distribution-set-from-target/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== GET /rest/v1/targets/{targetId}/metadata - -=== Implementation Notes - -Get a paged list of meta data for a target. Required permission: READ_REPOSITORY - -=== Get a paged list of meta data - -==== Curl - -include::{snippets}/targets/get-metadata/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/get-metadata/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/get-metadata/path-parameters.adoc[] - -==== Request query parameter - -include::{snippets}/targets/get-metadata-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/targets/get-metadata-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targets/get-metadata/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/get-metadata/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /rest/v1/targets/{targetId}/metadata - -=== Implementation Notes - -Create a list of meta data entries Required permissions: READ_REPOSITORY and UPDATE_TARGET - -=== Create a list of meta data entries - - -==== CURL - -include::{snippets}/targets/create-metadata/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/create-metadata/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/create-metadata/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/targets/create-metadata/request-fields.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/targets/create-metadata/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/targets/{targetId}/metadata/{metadataKey} - - -=== Implementation Notes - -Delete a single meta data. Required permission: UPDATE_REPOSITORY - -=== Delete a single meta data - -==== CURL - -include::{snippets}/targets/delete-metadata/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/delete-metadata/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/delete-metadata/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/targets/delete-metadata/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/targets/{targetId}/metadata/{metadataKey} - - -=== Implementation Notes - -Get a single meta data value for a meta data key. Required permission: READ_REPOSITORY - -=== Get a single meta data value - -==== Curl - -include::{snippets}/targets/get-metadata-value/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/get-metadata-value/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/get-metadata-value/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targets/get-metadata-value/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/get-metadata-value/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== PUT /rest/v1/targets/{targetId}/metadata/{metadataKey} - - -=== Implementation Notes - -Update a single meta data value for speficic key. Required permission: UPDATE_REPOSITORY - -=== Update a single meta data value - -==== Curl - -include::{snippets}/targets/update-metadata/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/update-metadata/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/update-metadata/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/targets/update-metadata/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targets/update-metadata/response-fields.adoc[] - -==== Response example - -include::{snippets}/targets/update-metadata/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /rest/v1/targets/{targetId}/targettype - -=== Implementation Notes - -Assign or update the target type of a target. Required permission: UPDATE_TARGET - -=== Assign a target type to a target - -==== Curl - -include::{snippets}/targets/post-assign-target-type/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/post-assign-target-type/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/post-assign-target-type/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/targets/post-assign-target-type/request-fields.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/targets/post-assign-target-type/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/429.adoc[] -|=== - -== DELETE /rest/v1/targets/{targetId}/targettype - -=== Implementation Notes - -Remove the target type from a target. The target type will be set to null. Required permission: UPDATE_TARGET - -=== Remove a target type from a target - -==== Curl - -include::{snippets}/targets/delete-unassign-target-type/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targets/delete-unassign-target-type/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targets/delete-unassign-target-type/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/targets/delete-unassign-target-type/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/429.adoc[] -|=== - -== Additional content - -[[error-body]] -=== Error body - -include::../errors/error-response-body.adoc[] - - diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/targettag-api-guide.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/targettag-api-guide.adoc deleted file mode 100644 index a1a9cfccb7..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/targettag-api-guide.adoc +++ /dev/null @@ -1,431 +0,0 @@ -:doctype: book -:icons: font -:source-highlighter: highlightjs -:toc: macro -:toclevels: 1 -:sectlinks: -:linkattrs: - -[[targettag]] -= Target Tag - -toc::[] - - -== GET /rest/v1/targettags - -=== Implementation notes - -Handles the GET request of retrieving all target tags. - -=== Get paged list of target tags - -==== CURL - -include::{snippets}/targettag/get-target-tags/curl-request.adoc[] - -==== Request URL - -A `GET` request is used to access the target tags - -include::{snippets}/targettag/get-target-tags/http-request.adoc[] - -==== Request query parameter - -include::{snippets}/targettag/get-target-tags-with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/targettag/get-target-tags-with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targettag/get-target-tags/response-fields.adoc[] - -==== Response example - -include::{snippets}/targettag/get-target-tags/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/targettags/{targetTagId} - -=== Implementation notes - -Handles the GET request of retrieving a single target tag. - -=== Get a single target tag - -==== CURL - -include::{snippets}/targettag/get-target-tag/curl-request.adoc[] - -==== Request URL - -A `GET` request is used to access the target tag - -include::{snippets}/targettag/get-target-tag/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targettag/get-target-tag/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targettag/get-target-tag/response-fields.adoc[] - -==== Response example - -include::{snippets}/targettag/get-target-tag/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/targettags - -=== Implementation Notes - -Handles the POST request of creating new target tag. The request body must always be a list of target tags. - -=== Create list of target tags - -==== CURL - -include::{snippets}/targettag/create-target-tags/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targettag/create-target-tags/http-request.adoc[] - -==== Request fields - -include::{snippets}/targettag/create-target-tags/request-fields.adoc[] - -=== Response (Status 201) - -==== Response fields - -include::{snippets}/targettag/create-target-tags/response-fields.adoc[] - -==== Response example - -include::{snippets}/targettag/create-target-tags/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== PUT /rest/v1/targettags/{targetTagId} - -=== Implementation Notes - -Handles the PUT request of updating a target tag. - -=== Update a target tag - -==== Curl - -include::{snippets}/targettag/update-tagret-tag/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targettag/update-tagret-tag/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targettag/update-tagret-tag/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/targettag/update-tagret-tag/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targettag/update-tagret-tag/response-fields.adoc[] - -==== Response example - -include::{snippets}/targettag/update-tagret-tag/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - - -== DELETE /rest/v1/targettags/{targetTagId} - -=== Implementation Notes - -Handles the DELETE request of deleting a single target tag. - -=== Deleting a target tag - -==== CURL - -include::{snippets}/targettag/delete-target-tag/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targettag/delete-target-tag/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targettag/delete-target-tag/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/targettag/delete-target-tag/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== GET /rest/v1/targettags/{targetTagId}/assigned - -=== Implementation Notes - -Handles the GET request of retrieving a list of assigned targets. - -=== Get a list of assigned targets - -==== CURL - -include::{snippets}/targettag/get-assigned-targets/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targettag/get-assigned-targets/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targettag/get-assigned-targets/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targettag/get-assigned-targets/response-fields.adoc[] - -==== Response example - -include::{snippets}/targettag/get-assigned-targets/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - - -== POST /rest/v1/targettags/{targetTagId}/assigned/toggleTagAssignment - -=== Implementation Notes - -Handles the POST request of toogle target assignment. The request body must always be a list of controller ids. - -=== Toogle target assignment - -==== CURL - -include::{snippets}/targettag/toggle-tag-assignment/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targettag/toggle-tag-assignment/http-request.adoc[] - -==== Request fields - -include::{snippets}/targettag/toggle-tag-assignment/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targettag/toggle-tag-assignment/response-fields.adoc[] - -==== Response example - -include::{snippets}/targettag/toggle-tag-assignment/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== POST /rest/v1/targettags/{targetTagId}/assigned - -=== Implementation Notes - -Handles the POST request of target assignment. Already assigned target will be ignored. - -=== Target assignment - -==== CURL - -include::{snippets}/targettag/assign-targets/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targettag/assign-targets/http-request.adoc[] - -==== Request fields - -include::{snippets}/targettag/assign-targets/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/targettag/assign-targets/response-fields.adoc[] - -==== Response example - -include::{snippets}/targettag/assign-targets/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== DELETE /rest/v1/targettags/{targetTagId}/assigned/{controllerId} - -=== Implementation Notes - -Handles the DELETE request to unassign the given target. - -=== Unassign a target - -==== CURL - -include::{snippets}/targettag/unassign-target/curl-request.adoc[] - -==== Request URL - -include::{snippets}/targettag/unassign-target/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/targettag/unassign-target/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response example - -include::{snippets}/targettag/unassign-target/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== Additional content - -[[error-body]] -=== Error body - -include::../errors/error-response-body.adoc[] - - - diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/tenant-api-guide.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/tenant-api-guide.adoc deleted file mode 100644 index 6bc35a9484..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/asciidoc/tenant-api-guide.adoc +++ /dev/null @@ -1,194 +0,0 @@ -:doctype: book -:icons: font -:source-highlighter: highlightjs -:toc: macro -:toclevels: 1 -:sectlinks: -:linkattrs: - -[[tenant]] -= System Configuration - -toc::[] - - -== GET /rest/v1/system/configs - -=== Implementation notes - -The GET request returns a list of all possible configuration keys for the tenant. Required Permission: TENANT_CONFIGURATION - -=== Get all configuration parameters - -==== CURL - -include::{snippets}/tenant/get-tenant-configrations/curl-request.adoc[] - -==== Request URL - -include::{snippets}/tenant/get-tenant-configrations/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/tenant/get-tenant-configrations/response-fields.adoc[] - -==== Response example - -include::{snippets}/tenant/get-tenant-configrations/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== GET /rest/v1/system/configs/{keyName} - -=== Implementation notes - -The GET request returns the configuration value of a specific configuration key for the tenant. Required Permission: TENANT_CONFIGURATION - -=== Read a configuration parameter - -==== CURL - -include::{snippets}/tenant/get-tenant-configration/curl-request.adoc[] - -==== Request URL - -include::{snippets}/tenant/get-tenant-configration/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/tenant/get-tenant-configration/path-parameters.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/tenant/get-tenant-configration/response-fields.adoc[] - -==== Response example - -include::{snippets}/tenant/get-tenant-configration/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== PUT /rest/v1/system/configs/{keyName} - -=== Implementation notes - -The PUT request changes a configuration value of a specific configuration key for the tenant. Required Permission: TENANT_CONFIGURATION - -=== Change a configuration parameter - -==== CURL - -include::{snippets}/tenant/put-tenant-configration/curl-request.adoc[] - -==== Request URL - -include::{snippets}/tenant/put-tenant-configration/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/tenant/put-tenant-configration/path-parameters.adoc[] - -==== Request fields - -include::{snippets}/tenant/put-tenant-configration/request-fields.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/tenant/put-tenant-configration/response-fields.adoc[] - -==== Response example - -include::{snippets}/tenant/put-tenant-configration/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/409.adoc[] -include::../errors/415.adoc[] -include::../errors/429.adoc[] -|=== - -== DELETE /rest/v1/system/configs/{keyName} - -=== Implementation notes - -The DELETE request removes a tenant specific configuration value for the tenant. Afterwards the global default value is used. Required Permission: TENANT_CONFIGURATION - -=== Removes a configuration parameter - -==== CURL - -include::{snippets}/tenant/delete-tenant-configration/curl-request.adoc[] - -==== Request URL - -include::{snippets}/tenant/delete-tenant-configration/http-request.adoc[] - -==== Request path parameter - -include::{snippets}/tenant/delete-tenant-configration/path-parameters.adoc[] - -=== Response (Status 204) - -==== Response example - -include::{snippets}/tenant/delete-tenant-configration/http-response.adoc[] - -=== Error responses - -|=== -| HTTP Status Code | Reason | Response Model - -include::../errors/400.adoc[] -include::../errors/401.adoc[] -include::../errors/403.adoc[] -include::../errors/404.adoc[] -include::../errors/405.adoc[] -include::../errors/406.adoc[] -include::../errors/429.adoc[] -|=== - -== Additional content - -[[error-body]] -=== Error body - -include::../errors/error-response-body.adoc[] diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/400.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/errors/400.adoc deleted file mode 100644 index 18af7627b2..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/400.adoc +++ /dev/null @@ -1,3 +0,0 @@ -| `400 Bad Request` -| Bad Request - e.g. invalid parameters -| diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/400_multiassignment.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/errors/400_multiassignment.adoc deleted file mode 100644 index e502b8fbea..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/400_multiassignment.adoc +++ /dev/null @@ -1,3 +0,0 @@ -| `400 Bad Request` -| Bad Request - e.g. invalid parameters or 'multi assignments' is disabled -| diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/401.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/errors/401.adoc deleted file mode 100644 index bfe5050c9b..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/401.adoc +++ /dev/null @@ -1,3 +0,0 @@ -| `401 Unauthorized` -| The request requires user authentication. -| diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/403.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/errors/403.adoc deleted file mode 100644 index 492f5a7226..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/403.adoc +++ /dev/null @@ -1,3 +0,0 @@ -| `403 Forbidden` -| Insufficient permissions, entity is not allowed to be changed (i.e. read-only) or data volume restriction applies. -| See <> diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/403_quota.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/errors/403_quota.adoc deleted file mode 100644 index 1a817026b9..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/403_quota.adoc +++ /dev/null @@ -1,3 +0,0 @@ -| `403 Forbidden` -| Insufficient permissions, data volume restriction applies or quota limit exceeded. -| See <> diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/404.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/errors/404.adoc deleted file mode 100644 index 85bf3f9b77..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/404.adoc +++ /dev/null @@ -1,3 +0,0 @@ -| `404 Not Found` -| Target not found. -| See <> diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/405.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/errors/405.adoc deleted file mode 100644 index 01159992be..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/405.adoc +++ /dev/null @@ -1,3 +0,0 @@ -| `405 Method Not Allowed` -| The http request method is not allowed on the resource. -| diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/406.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/errors/406.adoc deleted file mode 100644 index 8a3dc60b7b..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/406.adoc +++ /dev/null @@ -1,3 +0,0 @@ -| `406 Not Acceptable` -| In case accept header is specified and not application/json. -| diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/409.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/errors/409.adoc deleted file mode 100644 index 363b0e04de..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/409.adoc +++ /dev/null @@ -1,3 +0,0 @@ -| `409 Conflict` -| E.g. in case an entity is created or modified by another user in another request at the same time. You may retry your modification request. -| See <> diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/415.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/errors/415.adoc deleted file mode 100644 index 5a993596d6..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/415.adoc +++ /dev/null @@ -1,3 +0,0 @@ -| `415 Unsupported Media Type` -| The request was attempt with a media-type which is not supported by the server for this resource. -| diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/429.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/errors/429.adoc deleted file mode 100644 index c215b43deb..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/429.adoc +++ /dev/null @@ -1,3 +0,0 @@ -| `429 Too Many Request` -| Too many requests. The server will refuse further attempts and the client has to wait another second. -| diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/error-response-body.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/errors/error-response-body.adoc deleted file mode 100644 index a842b56fb4..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/errors/error-response-body.adoc +++ /dev/null @@ -1,27 +0,0 @@ -[source,http] ----- - -{ - "errorCode": "string", - "exceptionClass": "string", - "message": "string", - "parameters": [ - "string" - ] -} - ----- - -=== Field description - -|=== -|**Field** |**Description** -| errorCode -| A error code/key set by server -| exceptionClass -| The involved exceptionClass -| message -| An error message set by the server -| parameters -| A list of parameters -|=== diff --git a/hawkbit-rest/hawkbit-rest-docs/src/main/template/template.adoc b/hawkbit-rest/hawkbit-rest-docs/src/main/template/template.adoc deleted file mode 100644 index 13d600c0f0..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/main/template/template.adoc +++ /dev/null @@ -1,64 +0,0 @@ -= Management API -Eclipse hawkBit; -:doctype: book -:icons: font -:source-highlighter: highlightjs -:toc: macro -:toclevels: 1 -:sectlinks: -:linkattrs: - -[[resource-name]] -= Resource name - -toc::[] - - -== The request: Example: GET /rest/v1/targets - -=== Implementation notes - -..... Implementation notes ..... -..... Implementation notes ..... - -=== Describe the request: Example: Get paged list of targets - -==== CURL - -include::{snippets}/ ... ...curl-request.adoc[] - -==== Request URL - -include::{snippets}/... ...http-request.adoc[] - -==== Request path parameter - -include::{snippets}/ ... ...path-parameters.adoc[] - -==== Request fields - -include::{snippets}/ ... ...request-fields.adoc[] - -==== Request query parameter - -include::{snippets}/ ... ...with-parameters/request-parameters.adoc[] - -==== Request parameter example - -include::{snippets}/ ... ...with-parameters/http-request.adoc[] - -=== Response (Status 200) - -==== Response fields - -include::{snippets}/ ... ...response-fields.adoc[] - -==== Response example - -include::{snippets}/ ... ...http-response.adoc[] - -=== Error responses - -include::../errors/... -include::../errors/... -... \ No newline at end of file diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/ddi/documentation/DdiApiModelProperties.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/ddi/documentation/DdiApiModelProperties.java deleted file mode 100644 index cdbc1742a3..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/ddi/documentation/DdiApiModelProperties.java +++ /dev/null @@ -1,167 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.ddi.documentation; - -/** - * Model properties for the DDI API documentation. - */ -final class DdiApiModelProperties { - - // Direct Device Integration API - static final String CONTROLLER_ID = "id of the controller"; - - static final String TARGET_STATUS = "target action status"; - - static final String TARGET_EXEC_STATUS = "status of the action execution"; - - static final String TARGET_EXEC_STATUS_CODE = "optional individual status code"; - - static final String TARGET_RESULT_VALUE = "result of the action execution"; - - static final String TARGET_RESULT_DETAILS = "List of details message information"; - - static final String TARGET_RESULT_FINISHED = "defined status of the result"; - - static final String TARGET_RESULT_PROGRESS = "progress assumption of the device (currently not supported)."; - - static final String TARGET_PROGRESS_CNT = "current progress level"; - - static final String TARGET_PROGRESS_OF = "assumption concerning max progress level"; - - static final String ACTION_ID = "id of the action"; - - static final String FEEDBACK_ACTION_ID = "(@deprecated) id of the action"; - - static final String FEEDBACK_ACTION_TIME = "timestamp of the action"; - - static final String CANCEL_ACTION = "action that needs to be canceled"; - - static final String ACTION_ID_CANCELED = "id of the action that needs to be canceled (typically identical to id field on the cancel action itself)"; - - static final String ARTIFACT_HTTPS_HASHES_MD5SUM_LINK = "HTTPs Download resource for MD5SUM file is an optional auto generated artifact that is especially useful for " - + "Linux based devices on order to check artifact consistency after download by using the md5sum " - + "command line tool. The MD5 and SHA1 are in addition available as metadata in the deployment command itself."; - - static final String ARTIFACT_HTTP_HASHES_MD5SUM_LINK = "HTTP Download resource for MD5SUM file is an optional auto generated artifact that is especially useful for " - + "Linux based devices on order to check artifact consistency after download by using the md5sum " - + "command line tool. The MD5 and SHA1 are in addition available as metadata in the deployment command itself. " - + "(note: anonymous download needs to be enabled on the service account for non-TLS access)"; - - static final String ARTIFACT_HTTPS_DOWNLOAD_LINK_BY_CONTROLLER = "HTTPs Download resource for artifacts. The resource supports partial download " - + "as specified by RFC7233 (range requests). Keep in mind that the target " - + "needs to have the artifact assigned in order to be granted permission to download."; - - static final String ARTIFACT_HTTP_DOWNLOAD_LINK_BY_CONTROLLER = "HTTP Download resource for artifacts. The resource supports partial download " - + "as specified by RFC7233 (range requests). Keep in mind that the target " - + "needs to have the artifact assigned in order to be granted permission to download. " - + "(note: anonymous download needs to be enabled on the service account for non-TLS access)"; - - static final String CHUNK_TYPE = "Type of the chunk, e.g. firmware, bundle, app. In update server mapped to Software Module Type."; - - static final String SOFTWARE_MODULE_TYPE = "type of the software module, e.g. firmware, bundle, app"; - - static final String SOFTWARE_MODULE_VERSION = "version of the software module"; - - static final String SOFTWARE_MODULE_NAME = "name of the software module"; - - static final String SOFTWARE_MODULE_ARTIFACT_LINKS = "artifact links of the software module"; - - static final String SOFTWARE_MODULE_ID = "id of the software module"; - - static final String CHUNK_VERSION = "software version of the chunk"; - - static final String CHUNK_NAME = "name of the chunk"; - - static final String CHUNK_META_DATA = "meta data of the respective software module that has been marked with 'target visible'"; - - static final String CHUNK_META_DATA_KEY = "key of meta data entry"; - - static final String CHUNK_META_DATA_VALUE = "value of meta data entry"; - - static final String ARTIFACTS = "list of artifacts"; - - static final String TARGET_CONFIGURATION = "target configuration setup by the server"; - - static final String TARGET_POLL_TIME = "suggested sleep time between polls"; - - static final String TARGET_OPEN_ACTIONS = "Open Actions that the server has for the target"; - - static final String TARGET_SLEEP = "sleep time in HH:MM:SS notation"; - - static final String DEPLOYMENT = "Detailed deployment operation"; - - static final String CONFIRMATION = "Deployment confirmation operation"; - - static final String CANCEL = "Detailed cancel operation of a deployment"; - - static final String INSTALLED = "Detailed operation of last successfully finished action"; - - static final String HANDLING_DOWNLOAD = "handling for the download part of the provisioning process ('skip': do not download yet, 'attempt': server asks to download, 'forced': server requests immediate download)"; - - static final String HANDLING_UPDATE = "handling for the update part of the provisioning process ('skip': do not update yet, 'attempt': server asks to update, 'forced': server requests immediate update)"; - - static final String MAINTENANCE_WINDOW = "separation of download and installation by defining a maintenance window for the installation. Status shows if currently in a window."; - - static final String CHUNK = "Software chunks of an update. In server mapped by Software Module."; - - static final String SOFTWARE_MODULE = "software modules of an update"; - - static final String ARTIFACT = "artifact modules of an update"; - - static final String FILENAME = "file name of artifact"; - - static final String TARGET_CONFIG_DATA = "Link which is provided whenever the provisioning target or device is supposed " - + "to push its configuration data (aka. \"controller attributes\") to the server. Only shown for the initial " - + "configuration, after a successful update action, or if requested explicitly (e.g. via the management UI)."; - - static final String ARTIFACT_HASHES_SHA1 = "SHA1 hash of the artifact in Base 16 format"; - static final String ARTIFACT_HASHES_MD5 = "MD5 hash of the artifact"; - static final String ARTIFACT_HASHES_SHA256 = "SHA-256 hash of the artifact in Base 16 format"; - - static final String ARTIFACT_SIZE = "size of the artifact"; - - static final String ACTION_HISTORY = "Optional GET parameter to retrieve a given number of messages which are previously provided by the device. " - + "Useful if the devices sent state information to the feedback channel and never stored them locally."; - - static final String ACTION_HISTORY_RESP = "Current deployment state."; - - static final String ACTION_HISTORY_RESP_STATUS = "Status of the deployment based on previous feedback by the device."; - - static final String ACTION_HISTORY_RESP_MESSAGES = "Messages are previously sent to the feedback channel in LIFO order by the device. " - + "Note: The first status message is set by the system and describes the trigger of the deployment"; - - static final String UPDATE_MODE = "Optional parameter to specify the update mode that should be applied when updating target attributes. " - + "Valid values are 'merge', 'replace', and 'remove'. Defaults to 'merge'."; - - static final String TARGET_CONFIRMATION_STATE = "action confirmation state"; - - static final String TARGET_CONFIRMATION_CODE = "optional individual status code"; - - static final String TARGET_CONFIRMATION_DETAILS = "List of detailed message information"; - - static final String TARGET_AUTO_CONFIRM = "id of the action"; - - static final String TARGET_AUTO_CONFIRM_STATE = "flag if auto confirm is active"; - - static final String TARGET_AUTO_CONFIRM_INITIATOR_RESPONSE = "(optional) initiator set on activation"; - - static final String TARGET_AUTO_CONFIRM_REMARK_RESPONSE = "(optional) remark set on activation"; - - static final String TARGET_AUTO_CONFIRM_ACTIVATED_AT = "timestamp of the activation"; - - static final String TARGET_AUTO_CONFIRM_REFERENCE_ACTIVATE_AUTO_CONFIRM = "reference link to activate auto confirm"; - - static final String TARGET_AUTO_CONFIRM_REFERENCE_DEACTIVATE_AUTO_CONFIRM = "reference link to deactivate auto confirm"; - - static final String TARGET_AUTO_CONFIRM_REFERENCE_CONFIRMATION_BASE_ACTION = "reference link in case an action with open confirmation is present"; - - static final String TARGET_AUTO_CONFIRM_ACTIVATE_INITIATOR = "individual value (e.g. username) stored as initiator and automatically used as confirmed user in future actions"; - static final String TARGET_AUTO_CONFIRM_ACTIVATE_REMARK = "individual value to attach a remark which will be persisted when automatically confirming future actions"; - -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/ddi/documentation/RootControllerDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/ddi/documentation/RootControllerDocumentationTest.java deleted file mode 100644 index a930f7b4e3..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/ddi/documentation/RootControllerDocumentationTest.java +++ /dev/null @@ -1,814 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.ddi.documentation; - -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.put; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; -import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; -import static org.springframework.restdocs.request.RequestDocumentation.requestParameters; -import static org.springframework.restdocs.snippet.Attributes.key; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.io.ByteArrayInputStream; -import java.time.Instant; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang3.RandomStringUtils; -import org.eclipse.hawkbit.ddi.json.model.DdiActionFeedback; -import org.eclipse.hawkbit.ddi.json.model.DdiActivateAutoConfirmation; -import org.eclipse.hawkbit.ddi.json.model.DdiConfirmationFeedback; -import org.eclipse.hawkbit.ddi.json.model.DdiProgress; -import org.eclipse.hawkbit.ddi.json.model.DdiResult; -import org.eclipse.hawkbit.ddi.json.model.DdiStatus; -import org.eclipse.hawkbit.ddi.rest.api.DdiRestConstants; -import org.eclipse.hawkbit.repository.model.Action; -import org.eclipse.hawkbit.repository.model.Action.Status; -import org.eclipse.hawkbit.repository.model.ArtifactUpload; -import org.eclipse.hawkbit.repository.model.DistributionSet; -import org.eclipse.hawkbit.repository.model.SoftwareModule; -import org.eclipse.hawkbit.repository.model.Target; -import org.eclipse.hawkbit.repository.test.util.WithUser; -import org.eclipse.hawkbit.rest.documentation.AbstractApiRestDocumentation; -import org.eclipse.hawkbit.rest.documentation.ApiModelPropertiesGeneric; -import org.eclipse.hawkbit.rest.util.JsonBuilder; -import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.hateoas.MediaTypes; -import org.springframework.http.MediaType; -import org.springframework.restdocs.payload.JsonFieldType; - -import io.qameta.allure.Description; -import io.qameta.allure.Feature; -import io.qameta.allure.Story; - -/** - * Documentation generation for Direct Device Integration API. - * - */ -@Feature("Documentation Verification - Direct Device Integration API") -@Story("Root Resource") -public class RootControllerDocumentationTest extends AbstractApiRestDocumentation { - private static final String CONTROLLER_ID = "CONTROLLER_ID"; - - @Override - public String getResourceName() { - return "rootcontroller"; - } - - @BeforeEach - public void setUp() { - host = "ddi-api.host"; - } - - @Test - @Description("This base resource can be regularly polled by the controller on the provisioning target or device " - + "in order to retrieve actions that need to be executed. In this case including a config pull request and a deployment. " - + "The resource supports Etag based modification checks in order to save traffic.") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void getControllerBaseWithOpenDeplyoment() throws Exception { - final Action actionZero = prepareFinishedUpdate(CONTROLLER_ID, "zero", false); - final String controllerId = actionZero.getTarget().getControllerId(); - - final DistributionSet set = testdataFactory.createDistributionSet("one"); - assignDistributionSet(set.getId(), controllerId); - - mockMvc.perform(get(DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}", - tenantAware.getCurrentTenant(), controllerId).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID)), - responseFields( - fieldWithPath("config.polling").description(DdiApiModelProperties.TARGET_POLL_TIME), - fieldWithPath("config.polling.sleep").description(DdiApiModelProperties.TARGET_SLEEP), - fieldWithPath("_links").description(DdiApiModelProperties.TARGET_OPEN_ACTIONS), - fieldWithPath("_links.deploymentBase").description(DdiApiModelProperties.DEPLOYMENT), - fieldWithPath("_links.installedBase").description(DdiApiModelProperties.INSTALLED), - fieldWithPath("_links.configData") - .description(DdiApiModelProperties.TARGET_CONFIG_DATA)))); - } - - @Test - @Description("This base resource can be regularly polled by the controller on the provisioning target or device " - + "in order to retrieve actions that need to be executed. In this case including a config pull request and a cancellation. " - + "Note: as with deployments the cancel action has to be confirmed or rejected in order to move on to the next action.") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void getControllerBaseWithOpenDeploymentCancellation() throws Exception { - final Action actionZero = prepareFinishedUpdate(CONTROLLER_ID, "zero", false); - final String controllerId = actionZero.getTarget().getControllerId(); - - final DistributionSet set = testdataFactory.createDistributionSet("one"); - final DistributionSet setTwo = testdataFactory.createDistributionSet("two"); - - assignDistributionSet(set.getId(), controllerId); - assignDistributionSet(setTwo.getId(), controllerId); - - mockMvc.perform(get(DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}", - tenantAware.getCurrentTenant(), controllerId).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID)), - responseFields( - fieldWithPath("config.polling").description(DdiApiModelProperties.TARGET_POLL_TIME), - fieldWithPath("config.polling.sleep").description(DdiApiModelProperties.TARGET_SLEEP), - fieldWithPath("_links").description(DdiApiModelProperties.TARGET_OPEN_ACTIONS), - fieldWithPath("_links.cancelAction").description(DdiApiModelProperties.CANCEL), - fieldWithPath("_links.installedBase").description(DdiApiModelProperties.INSTALLED), - fieldWithPath("_links.configData") - .description(DdiApiModelProperties.TARGET_CONFIG_DATA)))); - } - - @Test - @Description("The SP server might cancel an operation, e.g. an unfinished update has a successor. " - + "It is up to the provisioning target to decide either to accept the cancellation or reject it.") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void getControllerCancelAction() throws Exception { - final DistributionSet set = testdataFactory.createDistributionSet("one"); - - set.getModules().forEach(module -> { - final byte[] random = RandomStringUtils.random(5).getBytes(); - - artifactManagement.create( - new ArtifactUpload(new ByteArrayInputStream(random), module.getId(), "binary.tgz", false, 0)); - artifactManagement.create( - new ArtifactUpload(new ByteArrayInputStream(random), module.getId(), "file.signature", false, 0)); - }); - - final Target target = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)); - final Long actionId = getFirstAssignedActionId(assignDistributionSet(set.getId(), target.getControllerId())); - final Action cancelAction = deploymentManagement.cancelAction(actionId); - - mockMvc.perform( - get(DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CANCEL_ACTION - + "/{actionId}", tenantAware.getCurrentTenant(), target.getControllerId(), cancelAction.getId()) - .accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID), - parameterWithName("actionId").description(DdiApiModelProperties.ACTION_ID_CANCELED)), - - responseFields(fieldWithPath("id").description(DdiApiModelProperties.ACTION_ID), - fieldWithPath("cancelAction").description(DdiApiModelProperties.CANCEL_ACTION), - fieldWithPath("cancelAction.stopId") - .description(DdiApiModelProperties.ACTION_ID_CANCELED) - - ))); - } - - @Test - @Description("It is up to the device to decided how much intermediate feedback is " - + "provided. However, the action will be kept open until the controller on the device reports a " - + "finished (either successful or error) or rejects the operation, e.g. the canceled actions have been started already.") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void postCancelActionFeedback() throws Exception { - final DistributionSet set = testdataFactory.createDistributionSet("one"); - - final Target target = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)); - final Long actionId = getFirstAssignedActionId(assignDistributionSet(set.getId(), target.getControllerId())); - final Action cancelAction = deploymentManagement.cancelAction(actionId); - - final DdiStatus ddiStatus = new DdiStatus(DdiStatus.ExecutionStatus.CLOSED, - new DdiResult(DdiResult.FinalResult.SUCCESS, new DdiProgress(2, 5)), null, List.of("Some feedback")); - final DdiActionFeedback feedback = new DdiActionFeedback(Instant.now().toString(), ddiStatus); - - mockMvc.perform(post( - DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CANCEL_ACTION - + "/{actionId}/feedback", - tenantAware.getCurrentTenant(), target.getControllerId(), cancelAction.getId()) - .content(objectMapper.writeValueAsString(feedback)) - .contentType(MediaType.APPLICATION_JSON_UTF8)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID), - parameterWithName("actionId").description(DdiApiModelProperties.ACTION_ID_CANCELED)), - requestFields( - optionalRequestFieldWithPath("id").description(DdiApiModelProperties.FEEDBACK_ACTION_ID) - .type(JsonFieldType.NUMBER), - optionalRequestFieldWithPath("time") - .description(DdiApiModelProperties.FEEDBACK_ACTION_TIME), - requestFieldWithPath("status").description(DdiApiModelProperties.TARGET_STATUS), - requestFieldWithPath("status.code") - .description(DdiApiModelProperties.TARGET_EXEC_STATUS_CODE), - requestFieldWithPath("status.execution") - .description(DdiApiModelProperties.TARGET_EXEC_STATUS).type("enum") - .attributes(key("value").value( - "['closed', 'proceeding', 'download', 'downloaded', 'canceled','scheduled', 'rejected', 'resumed']")), - requestFieldWithPath("status.result") - .description(DdiApiModelProperties.TARGET_RESULT_VALUE), - requestFieldWithPath("status.result.finished") - .description(DdiApiModelProperties.TARGET_RESULT_FINISHED).type("enum") - .attributes(key("value").value("['success', 'failure', 'none']")), - optionalRequestFieldWithPath("status.details") - .description(DdiApiModelProperties.TARGET_RESULT_DETAILS)))); - } - - @Test - @Description("The usual behaviour is that when a new device registers at the server it is " - + "requested to provide the meta information that will allow the server to identify the device on a " - + "hardware level (e.g. hardware revision, mac address, serial number etc.).") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void putConfigData() throws Exception { - final Target target = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)); - - final Map attributes = new HashMap<>(); - attributes.put("hwRevision", "2"); - attributes.put("VIN", "JH4TB2H26CC000000"); - - mockMvc.perform( - put(DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIG_DATA_ACTION, - tenantAware.getCurrentTenant(), target.getControllerId()) - .content(JsonBuilder.configData(attributes, "merge").toString()) - .contentType(MediaType.APPLICATION_JSON_UTF8)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID)), - requestFields( - requestFieldWithPath("data").description(DdiApiModelProperties.TARGET_CONFIG_DATA), - optionalRequestFieldWithPath("mode").description(DdiApiModelProperties.UPDATE_MODE) - .type("enum") - .attributes(key("value").value("['merge', 'replace', 'remove']"))))); - - } - - @Test - @Description("Core resource for deployment operations. Contains all information necessary in order to execute the operation.") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void getControllerBasedeploymentAction() throws Exception { - final DistributionSet set = testdataFactory.createDistributionSet("one"); - - set.getModules().forEach(module -> { - final byte[] random = RandomStringUtils.random(5).getBytes(); - - artifactManagement.create( - new ArtifactUpload(new ByteArrayInputStream(random), module.getId(), "binary.tgz", false, 0)); - artifactManagement.create( - new ArtifactUpload(new ByteArrayInputStream(random), module.getId(), "file.signature", false, 0)); - }); - - softwareModuleManagement.createMetaData( - entityFactory.softwareModuleMetadata().create(set.getModules().iterator().next().getId()) - .key("aMetadataKey").value("Metadata value as defined in software module").targetVisible(true)); - - final Target target = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)); - final Long actionId = getFirstAssignedActionId(assignDistributionSetWithMaintenanceWindow(set.getId(), - target.getControllerId(), getTestSchedule(-5), getTestDuration(10), getTestTimeZone())); - - controllerManagement.addInformationalActionStatus( - entityFactory.actionStatus().create(actionId).message("Started download").status(Status.DOWNLOAD)); - controllerManagement.addInformationalActionStatus(entityFactory.actionStatus().create(actionId) - .message("Download failed. ErrorCode #5876745. Retry").status(Status.WARNING)); - controllerManagement.addInformationalActionStatus( - entityFactory.actionStatus().create(actionId).message("Download done").status(Status.DOWNLOADED)); - controllerManagement.addInformationalActionStatus( - entityFactory.actionStatus().create(actionId).message("Write firmware").status(Status.RUNNING)); - controllerManagement.addInformationalActionStatus( - entityFactory.actionStatus().create(actionId).message("Reboot").status(Status.RUNNING)); - - mockMvc.perform(get( - DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.DEPLOYMENT_BASE_ACTION - + "/{actionId}?actionHistory=10", - tenantAware.getCurrentTenant(), target.getControllerId(), actionId).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID), - parameterWithName("actionId").description(DdiApiModelProperties.ACTION_ID)), - requestParameters( - parameterWithName("actionHistory").description(DdiApiModelProperties.ACTION_HISTORY)), - responseFields(fieldWithPath("id").description(DdiApiModelProperties.ACTION_ID), - fieldWithPath("deployment").description(DdiApiModelProperties.DEPLOYMENT), - fieldWithPath("deployment.download") - .description(DdiApiModelProperties.HANDLING_DOWNLOAD).type("enum") - .attributes(key("value").value("['skip', 'attempt', 'forced']")), - fieldWithPath("deployment.update").description(DdiApiModelProperties.HANDLING_UPDATE) - .type("enum").attributes(key("value").value("['skip', 'attempt', 'forced']")), - fieldWithPath("deployment.maintenanceWindow") - .description(DdiApiModelProperties.MAINTENANCE_WINDOW).type("enum") - .attributes(key("value").value("['available', 'unavailable']")), - fieldWithPath("deployment.chunks").description(DdiApiModelProperties.CHUNK), - fieldWithPath("deployment.chunks[].metadata") - .description(DdiApiModelProperties.CHUNK_META_DATA).optional(), - fieldWithPath("deployment.chunks[].metadata[].key") - .description(DdiApiModelProperties.CHUNK_META_DATA_KEY).optional(), - fieldWithPath("deployment.chunks[].metadata[].value") - .description(DdiApiModelProperties.CHUNK_META_DATA_VALUE).optional(), - fieldWithPath("deployment.chunks[].part").description(DdiApiModelProperties.CHUNK_TYPE), - fieldWithPath("deployment.chunks[].name").description(DdiApiModelProperties.CHUNK_NAME), - fieldWithPath("deployment.chunks[].version") - .description(DdiApiModelProperties.CHUNK_VERSION), - fieldWithPath("deployment.chunks[].artifacts") - .description(DdiApiModelProperties.ARTIFACTS), - fieldWithPath("deployment.chunks[].artifacts[].filename") - .description(DdiApiModelProperties.ARTIFACTS), - fieldWithPath("deployment.chunks[].artifacts[].hashes") - .description(DdiApiModelProperties.ARTIFACTS), - fieldWithPath("deployment.chunks[].artifacts[].hashes.sha1") - .description(DdiApiModelProperties.ARTIFACT_HASHES_SHA1), - fieldWithPath("deployment.chunks[].artifacts[].hashes.md5") - .description(DdiApiModelProperties.ARTIFACT_HASHES_MD5), - fieldWithPath("deployment.chunks[].artifacts[].hashes.sha256") - .description(DdiApiModelProperties.ARTIFACT_HASHES_SHA256), - fieldWithPath("deployment.chunks[].artifacts[].size") - .description(DdiApiModelProperties.ARTIFACT_SIZE), - fieldWithPath("deployment.chunks[].artifacts[]._links.download") - .description(DdiApiModelProperties.ARTIFACT_HTTPS_DOWNLOAD_LINK_BY_CONTROLLER), - fieldWithPath("deployment.chunks[].artifacts[]._links.md5sum") - .description(DdiApiModelProperties.ARTIFACT_HTTPS_HASHES_MD5SUM_LINK), - fieldWithPath("deployment.chunks[].artifacts[]._links.download-http") - .description(DdiApiModelProperties.ARTIFACT_HTTP_DOWNLOAD_LINK_BY_CONTROLLER), - fieldWithPath("deployment.chunks[].artifacts[]._links.md5sum-http") - .description(DdiApiModelProperties.ARTIFACT_HTTP_HASHES_MD5SUM_LINK), - fieldWithPath("actionHistory").description(DdiApiModelProperties.ACTION_HISTORY_RESP), - fieldWithPath("actionHistory.status") - .description(DdiApiModelProperties.ACTION_HISTORY_RESP_STATUS), - fieldWithPath("actionHistory.messages") - .description(DdiApiModelProperties.ACTION_HISTORY_RESP_MESSAGES)))); - - } - - @Test - @Description("Core resource for deployment operations. Contains all information necessary in order to execute the operation. Example with maintenance window where the device is requested to download only as it is not in the maintenance window yet.") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void getControllerBasedeploymentActionWithMaintenanceWindow() throws Exception { - final DistributionSet set = testdataFactory.createDistributionSet("one"); - - final Target target = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)); - final Long actionId = getFirstAssignedActionId(assignDistributionSetWithMaintenanceWindow(set.getId(), - target.getControllerId(), getTestSchedule(2), getTestDuration(1), getTestTimeZone())); - - mockMvc.perform(get( - DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.DEPLOYMENT_BASE_ACTION - + "/{actionId}?actionHistory=10", - tenantAware.getCurrentTenant(), target.getControllerId(), actionId).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID), - parameterWithName("actionId").description(DdiApiModelProperties.ACTION_ID)), - requestParameters( - parameterWithName("actionHistory").description(DdiApiModelProperties.ACTION_HISTORY)), - responseFields(fieldWithPath("id").description(DdiApiModelProperties.ACTION_ID), - fieldWithPath("deployment").description(DdiApiModelProperties.DEPLOYMENT), - fieldWithPath("deployment.download") - .description(DdiApiModelProperties.HANDLING_DOWNLOAD), - fieldWithPath("deployment.update").description(DdiApiModelProperties.HANDLING_UPDATE) - .type("enum").attributes(key("value").value("['attempt', 'forced']")), - fieldWithPath("deployment.maintenanceWindow") - .description(DdiApiModelProperties.MAINTENANCE_WINDOW).type("enum") - .attributes(key("value").value("['available', 'unavailable']")), - fieldWithPath("deployment.chunks").description(DdiApiModelProperties.CHUNK), - fieldWithPath("deployment.chunks[].part").description(DdiApiModelProperties.CHUNK_TYPE), - fieldWithPath("deployment.chunks[].name").description(DdiApiModelProperties.CHUNK_NAME), - fieldWithPath("deployment.chunks[].version") - .description(DdiApiModelProperties.CHUNK_VERSION), - fieldWithPath("actionHistory.status") - .description(DdiApiModelProperties.ACTION_HISTORY_RESP_STATUS), - fieldWithPath("actionHistory.messages") - .description(DdiApiModelProperties.ACTION_HISTORY_RESP_MESSAGES)))); - - } - - @Test - @Description("Feedback channel. It is up to the device to decided how much intermediate feedback is " - + "provided. However, the action will be kept open until the controller on the device reports a " - + "finished (either successful or error).") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void postBasedeploymentActionFeedback() throws Exception { - final DistributionSet set = testdataFactory.createDistributionSet("one"); - - final Target target = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)); - final Long actionId = getFirstAssignedActionId(assignDistributionSet(set.getId(), target.getControllerId())); - - final DdiStatus ddiStatus = new DdiStatus(DdiStatus.ExecutionStatus.CLOSED, - new DdiResult(DdiResult.FinalResult.SUCCESS, new DdiProgress(2, 5)), 200, List.of("Feedback message")); - final DdiActionFeedback feedback = new DdiActionFeedback(Instant.now().toString(), ddiStatus); - - mockMvc.perform(post(DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" - + DdiRestConstants.DEPLOYMENT_BASE_ACTION + "/{actionId}/feedback", tenantAware.getCurrentTenant(), - target.getControllerId(), actionId).content(objectMapper.writeValueAsString(feedback)) - .contentType(MediaType.APPLICATION_JSON_UTF8).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID), - parameterWithName("actionId").description(DdiApiModelProperties.ACTION_ID)), - - requestFields( - optionalRequestFieldWithPath("id").description(DdiApiModelProperties.FEEDBACK_ACTION_ID) - .type(JsonFieldType.NUMBER), - optionalRequestFieldWithPath("time") - .description(DdiApiModelProperties.FEEDBACK_ACTION_TIME), - requestFieldWithPath("status").description(DdiApiModelProperties.TARGET_STATUS), - requestFieldWithPath("status.code") - .description(DdiApiModelProperties.TARGET_EXEC_STATUS_CODE), - requestFieldWithPath("status.execution") - .description(DdiApiModelProperties.TARGET_EXEC_STATUS).type("enum") - .attributes(key("value").value( - "['closed', 'proceeding', 'download', 'downloaded', 'canceled','scheduled', 'rejected', 'resumed']")), - requestFieldWithPath("status.result") - .description(DdiApiModelProperties.TARGET_RESULT_VALUE), - requestFieldWithPath("status.result.finished") - .description(DdiApiModelProperties.TARGET_RESULT_FINISHED).type("enum") - .attributes(key("value").value("['success', 'failure', 'none']")), - optionalRequestFieldWithPath("status.result.progress") - .description(DdiApiModelProperties.TARGET_RESULT_PROGRESS), - optionalRequestFieldWithPath("status.details") - .description(DdiApiModelProperties.TARGET_RESULT_DETAILS)))); - } - - @Test - @Description("Returns all artifacts that are assigned to the software module." - + "Can be useful for the target to double check that its current state matches with the targeted state.") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void getSoftwareModulesArtifacts() throws Exception { - final DistributionSet set = testdataFactory.createDistributionSet(""); - - final SoftwareModule module = (SoftwareModule) set.getModules().toArray()[0]; - - final byte[] random = RandomStringUtils.random(5).getBytes(); - artifactManagement - .create(new ArtifactUpload(new ByteArrayInputStream(random), module.getId(), "binaryFile", false, 0)); - - final Target target = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)); - assignDistributionSet(set.getId(), target.getControllerId()); - - mockMvc.perform( - get(DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/softwaremodules/{moduleId}/artifacts", - tenantAware.getCurrentTenant(), target.getControllerId(), module.getId()) - .accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID), - parameterWithName("moduleId").description(DdiApiModelProperties.SOFTWARE_MODULE_ID)), - responseFields(fieldWithPath("[]filename").description(DdiApiModelProperties.ARTIFACTS), - fieldWithPath("[]hashes").description(DdiApiModelProperties.ARTIFACTS), - fieldWithPath("[]hashes.sha1").description(DdiApiModelProperties.ARTIFACT_HASHES_SHA1), - fieldWithPath("[]hashes.md5").description(DdiApiModelProperties.ARTIFACT_HASHES_MD5), - fieldWithPath("[]hashes.sha256") - .description(DdiApiModelProperties.ARTIFACT_HASHES_SHA256), - fieldWithPath("[]size").description(DdiApiModelProperties.ARTIFACT_SIZE), - fieldWithPath("[]_links.download") - .description(DdiApiModelProperties.ARTIFACT_HTTPS_DOWNLOAD_LINK_BY_CONTROLLER), - fieldWithPath("[]_links.md5sum") - .description(DdiApiModelProperties.ARTIFACT_HTTPS_HASHES_MD5SUM_LINK), - fieldWithPath("[]_links.download-http") - .description(DdiApiModelProperties.ARTIFACT_HTTP_DOWNLOAD_LINK_BY_CONTROLLER), - fieldWithPath("[]_links.md5sum-http") - .description(DdiApiModelProperties.ARTIFACT_HTTP_HASHES_MD5SUM_LINK)))); - } - - @Test - @Description("Resource to receive information of the previous installation. The response will be of same format as " - + "the deploymentBase operation.") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void getControllerInstalledBaseAction() throws Exception { - final DistributionSet set = testdataFactory.createDistributionSet("zero"); - - set.getModules().forEach(module -> { - final byte[] random = RandomStringUtils.random(5).getBytes(); - artifactManagement.create( - new ArtifactUpload(new ByteArrayInputStream(random), module.getId(), "binary.tgz", false, 0)); - artifactManagement.create( - new ArtifactUpload(new ByteArrayInputStream(random), module.getId(), "file.signature", false, 0)); - }); - - softwareModuleManagement.createMetaData( - entityFactory.softwareModuleMetadata().create(set.getModules().iterator().next().getId()) - .key("aMetadataKey").value("Metadata value as defined in software module").targetVisible(true)); - - final Target target = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)); - final Long actionId = getFirstAssignedActionId(assignDistributionSetWithMaintenanceWindow(set.getId(), - target.getControllerId(), getTestSchedule(-5), getTestDuration(10), getTestTimeZone())); - - controllerManagement.addInformationalActionStatus( - entityFactory.actionStatus().create(actionId).message("Started download").status(Status.DOWNLOAD)); - controllerManagement.addInformationalActionStatus(entityFactory.actionStatus().create(actionId) - .message("Download failed. ErrorCode #5876745. Retry").status(Status.WARNING)); - controllerManagement.addInformationalActionStatus( - entityFactory.actionStatus().create(actionId).message("Download done").status(Status.DOWNLOADED)); - controllerManagement.addInformationalActionStatus( - entityFactory.actionStatus().create(actionId).message("Write firmware").status(Status.RUNNING)); - controllerManagement.addInformationalActionStatus( - entityFactory.actionStatus().create(actionId).message("Reboot").status(Status.RUNNING)); - controllerManagement.addUpdateActionStatus( - entityFactory.actionStatus().create(actionId).message("Installed").status(Status.FINISHED)); - - mockMvc.perform(get( - DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.INSTALLED_BASE_ACTION - + "/{actionId}?actionHistory=10", - tenantAware.getCurrentTenant(), target.getControllerId(), actionId).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID), - parameterWithName("actionId").description(DdiApiModelProperties.ACTION_ID)), - requestParameters( - parameterWithName("actionHistory").description(DdiApiModelProperties.ACTION_HISTORY)), - responseFields(fieldWithPath("id").description(DdiApiModelProperties.ACTION_ID), - fieldWithPath("deployment").description(DdiApiModelProperties.DEPLOYMENT), - fieldWithPath("deployment.download") - .description(DdiApiModelProperties.HANDLING_DOWNLOAD).type("enum") - .attributes(key("value").value("['skip', 'attempt', 'forced']")), - fieldWithPath("deployment.update").description(DdiApiModelProperties.HANDLING_UPDATE) - .type("enum").attributes(key("value").value("['skip', 'attempt', 'forced']")), - fieldWithPath("deployment.maintenanceWindow") - .description(DdiApiModelProperties.MAINTENANCE_WINDOW).type("enum") - .attributes(key("value").value("['available', 'unavailable']")), - fieldWithPath("deployment.chunks").description(DdiApiModelProperties.CHUNK), - fieldWithPath("deployment.chunks[].metadata") - .description(DdiApiModelProperties.CHUNK_META_DATA).optional(), - fieldWithPath("deployment.chunks[].metadata[].key") - .description(DdiApiModelProperties.CHUNK_META_DATA_KEY).optional(), - fieldWithPath("deployment.chunks[].metadata[].value") - .description(DdiApiModelProperties.CHUNK_META_DATA_VALUE).optional(), - fieldWithPath("deployment.chunks[].part").description(DdiApiModelProperties.CHUNK_TYPE), - fieldWithPath("deployment.chunks[].name").description(DdiApiModelProperties.CHUNK_NAME), - fieldWithPath("deployment.chunks[].version") - .description(DdiApiModelProperties.CHUNK_VERSION), - fieldWithPath("deployment.chunks[].artifacts") - .description(DdiApiModelProperties.ARTIFACTS), - fieldWithPath("deployment.chunks[].artifacts[].filename") - .description(DdiApiModelProperties.ARTIFACTS), - fieldWithPath("deployment.chunks[].artifacts[].hashes") - .description(DdiApiModelProperties.ARTIFACTS), - fieldWithPath("deployment.chunks[].artifacts[].hashes.sha1") - .description(DdiApiModelProperties.ARTIFACT_HASHES_SHA1), - fieldWithPath("deployment.chunks[].artifacts[].hashes.md5") - .description(DdiApiModelProperties.ARTIFACT_HASHES_MD5), - fieldWithPath("deployment.chunks[].artifacts[].hashes.sha256") - .description(DdiApiModelProperties.ARTIFACT_HASHES_SHA256), - fieldWithPath("deployment.chunks[].artifacts[].size") - .description(DdiApiModelProperties.ARTIFACT_SIZE), - fieldWithPath("deployment.chunks[].artifacts[]._links.download") - .description(DdiApiModelProperties.ARTIFACT_HTTPS_DOWNLOAD_LINK_BY_CONTROLLER), - fieldWithPath("deployment.chunks[].artifacts[]._links.md5sum") - .description(DdiApiModelProperties.ARTIFACT_HTTPS_HASHES_MD5SUM_LINK), - fieldWithPath("deployment.chunks[].artifacts[]._links.download-http") - .description(DdiApiModelProperties.ARTIFACT_HTTP_DOWNLOAD_LINK_BY_CONTROLLER), - fieldWithPath("deployment.chunks[].artifacts[]._links.md5sum-http") - .description(DdiApiModelProperties.ARTIFACT_HTTP_HASHES_MD5SUM_LINK), - fieldWithPath("actionHistory").description(DdiApiModelProperties.ACTION_HISTORY_RESP), - fieldWithPath("actionHistory.status") - .description(DdiApiModelProperties.ACTION_HISTORY_RESP_STATUS), - fieldWithPath("actionHistory.messages") - .description(DdiApiModelProperties.ACTION_HISTORY_RESP_MESSAGES)))); - - } - - @Test - @Description("Resource to retrieve the current state of auto confirmation. In case auto-confirm is active a reference to disable it will be provided.") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void getConfirmationBaseWithAutoConfirmActive() throws Exception { - enableConfirmationFlow(); - - final DistributionSet set = testdataFactory.createDistributionSet("one"); - final Target target = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)); - confirmationManagement.activateAutoConfirmation(target.getControllerId(), "exampleUserId", "exampleRemark"); - assignDistributionSetWithMaintenanceWindow(set.getId(), target.getControllerId(), getTestSchedule(-5), - getTestDuration(10), getTestTimeZone()); - - mockMvc.perform( - get(DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE, - tenantAware.getCurrentTenant(), target.getControllerId()).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID)), - responseFields( - fieldWithPath("autoConfirm").description(DdiApiModelProperties.TARGET_AUTO_CONFIRM), - fieldWithPath("autoConfirm.active") - .description(DdiApiModelProperties.TARGET_AUTO_CONFIRM_STATE), - fieldWithPath("autoConfirm.initiator") - .description(DdiApiModelProperties.TARGET_AUTO_CONFIRM_INITIATOR_RESPONSE), - fieldWithPath("autoConfirm.remark") - .description(DdiApiModelProperties.TARGET_AUTO_CONFIRM_REMARK_RESPONSE), - fieldWithPath("autoConfirm.activatedAt") - .description(DdiApiModelProperties.TARGET_AUTO_CONFIRM_ACTIVATED_AT), - fieldWithPath("_links.deactivateAutoConfirm").description( - DdiApiModelProperties.TARGET_AUTO_CONFIRM_REFERENCE_DEACTIVATE_AUTO_CONFIRM)))); - } - - @Test - @Description("Resource to retrieve the current state of auto confirmation. In case actions are waiting for a confirmation, they will be referenced.") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void getConfirmationBaseWithAutoConfirmDeactivated() throws Exception { - enableConfirmationFlow(); - - final DistributionSet set = testdataFactory.createDistributionSet("one"); - final Target target = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)); - assignDistributionSetWithMaintenanceWindow(set.getId(), target.getControllerId(), getTestSchedule(-5), - getTestDuration(10), getTestTimeZone()); - - mockMvc.perform( - get(DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE, - tenantAware.getCurrentTenant(), target.getControllerId()).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID)), - responseFields( - fieldWithPath("autoConfirm").description(DdiApiModelProperties.TARGET_AUTO_CONFIRM), - fieldWithPath("autoConfirm.active") - .description(DdiApiModelProperties.TARGET_AUTO_CONFIRM_STATE), - fieldWithPath("_links.activateAutoConfirm").description( - DdiApiModelProperties.TARGET_AUTO_CONFIRM_REFERENCE_ACTIVATE_AUTO_CONFIRM), - fieldWithPath("_links.confirmationBase").description( - DdiApiModelProperties.TARGET_AUTO_CONFIRM_REFERENCE_CONFIRMATION_BASE_ACTION)))); - } - - @Test - @Description("Core resource for confirmation of actions. Contains all necessary information for confirmation.") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void getConfirmationBaseAction() throws Exception { - enableConfirmationFlow(); - - final DistributionSet set = testdataFactory.createDistributionSet("one"); - - set.getModules().forEach(module -> { - final byte[] random = RandomStringUtils.random(5).getBytes(); - - artifactManagement.create( - new ArtifactUpload(new ByteArrayInputStream(random), module.getId(), "binary.tgz", false, 0)); - artifactManagement.create( - new ArtifactUpload(new ByteArrayInputStream(random), module.getId(), "file.signature", false, 0)); - }); - - softwareModuleManagement.createMetaData( - entityFactory.softwareModuleMetadata().create(set.getModules().iterator().next().getId()) - .key("aMetadataKey").value("Metadata value as defined in software module").targetVisible(true)); - - final Target target = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)); - final Long actionId = getFirstAssignedActionId(assignDistributionSetWithMaintenanceWindow(set.getId(), - target.getControllerId(), getTestSchedule(-5), getTestDuration(10), getTestTimeZone())); - - mockMvc.perform(get( - DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE - + "/{actionId}?actionHistory=10", - tenantAware.getCurrentTenant(), target.getControllerId(), actionId).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID), - parameterWithName("actionId").description(DdiApiModelProperties.ACTION_ID)), - requestParameters( - parameterWithName("actionHistory").description(DdiApiModelProperties.ACTION_HISTORY)), - responseFields(fieldWithPath("id").description(DdiApiModelProperties.ACTION_ID), - fieldWithPath("confirmation").description(DdiApiModelProperties.CONFIRMATION), - fieldWithPath("confirmation.download") - .description(DdiApiModelProperties.HANDLING_DOWNLOAD).type("enum") - .attributes(key("value").value("['skip', 'attempt', 'forced']")), - fieldWithPath("confirmation.update").description(DdiApiModelProperties.HANDLING_UPDATE) - .type("enum").attributes(key("value").value("['skip', 'attempt', 'forced']")), - fieldWithPath("confirmation.maintenanceWindow") - .description(DdiApiModelProperties.MAINTENANCE_WINDOW).type("enum") - .attributes(key("value").value("['available', 'unavailable']")), - fieldWithPath("confirmation.chunks").description(DdiApiModelProperties.CHUNK), - fieldWithPath("confirmation.chunks[].metadata") - .description(DdiApiModelProperties.CHUNK_META_DATA).optional(), - fieldWithPath("confirmation.chunks[].metadata[].key") - .description(DdiApiModelProperties.CHUNK_META_DATA_KEY).optional(), - fieldWithPath("confirmation.chunks[].metadata[].value") - .description(DdiApiModelProperties.CHUNK_META_DATA_VALUE).optional(), - fieldWithPath("confirmation.chunks[].part") - .description(DdiApiModelProperties.CHUNK_TYPE), - fieldWithPath("confirmation.chunks[].name") - .description(DdiApiModelProperties.CHUNK_NAME), - fieldWithPath("confirmation.chunks[].version") - .description(DdiApiModelProperties.CHUNK_VERSION), - fieldWithPath("confirmation.chunks[].artifacts") - .description(DdiApiModelProperties.ARTIFACTS), - fieldWithPath("confirmation.chunks[].artifacts[].filename") - .description(DdiApiModelProperties.ARTIFACTS), - fieldWithPath("confirmation.chunks[].artifacts[].hashes") - .description(DdiApiModelProperties.ARTIFACTS), - fieldWithPath("confirmation.chunks[].artifacts[].hashes.sha1") - .description(DdiApiModelProperties.ARTIFACT_HASHES_SHA1), - fieldWithPath("confirmation.chunks[].artifacts[].hashes.md5") - .description(DdiApiModelProperties.ARTIFACT_HASHES_MD5), - fieldWithPath("confirmation.chunks[].artifacts[].hashes.sha256") - .description(DdiApiModelProperties.ARTIFACT_HASHES_SHA256), - fieldWithPath("confirmation.chunks[].artifacts[].size") - .description(DdiApiModelProperties.ARTIFACT_SIZE), - fieldWithPath("confirmation.chunks[].artifacts[]._links.download") - .description(DdiApiModelProperties.ARTIFACT_HTTPS_DOWNLOAD_LINK_BY_CONTROLLER), - fieldWithPath("confirmation.chunks[].artifacts[]._links.md5sum") - .description(DdiApiModelProperties.ARTIFACT_HTTPS_HASHES_MD5SUM_LINK), - fieldWithPath("confirmation.chunks[].artifacts[]._links.download-http") - .description(DdiApiModelProperties.ARTIFACT_HTTP_DOWNLOAD_LINK_BY_CONTROLLER), - fieldWithPath("confirmation.chunks[].artifacts[]._links.md5sum-http") - .description(DdiApiModelProperties.ARTIFACT_HTTP_HASHES_MD5SUM_LINK), - fieldWithPath("actionHistory").description(DdiApiModelProperties.ACTION_HISTORY_RESP), - fieldWithPath("actionHistory.status") - .description(DdiApiModelProperties.ACTION_HISTORY_RESP_STATUS), - fieldWithPath("actionHistory.messages") - .description(DdiApiModelProperties.ACTION_HISTORY_RESP_MESSAGES)))); - } - - @Test - @Description("Feedback channel for confirming an action") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void postConfirmationFeedback() throws Exception { - enableConfirmationFlow(); - - final DistributionSet set = testdataFactory.createDistributionSet("one"); - - final Target target = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)); - final Long actionId = getFirstAssignedActionId(assignDistributionSet(set.getId(), target.getControllerId())); - - final DdiConfirmationFeedback feedback = new DdiConfirmationFeedback( - DdiConfirmationFeedback.Confirmation.CONFIRMED, 33, List.of("Feedback message")); - - mockMvc.perform( - post(DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE - + "/{actionId}/feedback", tenantAware.getCurrentTenant(), target.getControllerId(), actionId) - .content(objectMapper.writeValueAsString(feedback)) - .contentType(MediaType.APPLICATION_JSON_UTF8).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect( - status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID), - parameterWithName("actionId").description(DdiApiModelProperties.ACTION_ID)), - - requestFields( - requestFieldWithPath("confirmation") - .description(DdiApiModelProperties.TARGET_CONFIRMATION_STATE).type("enum") - .attributes(key("value").value("['confirmed', 'denied']")), - - optionalRequestFieldWithPath("code") - .description(DdiApiModelProperties.TARGET_CONFIRMATION_CODE), - - optionalRequestFieldWithPath("details") - .description(DdiApiModelProperties.TARGET_CONFIRMATION_DETAILS)))); - } - - @Test - @Description("Resource to activate auto-confirmation on a target.") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void activateAutoConfirmation() throws Exception { - final Target target = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)); - - final DdiActivateAutoConfirmation body = new DdiActivateAutoConfirmation("exampleUser", "exampleRemark"); - - mockMvc.perform(post( - DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE + "/" - + DdiRestConstants.AUTO_CONFIRM_ACTIVATE, - tenantAware.getCurrentTenant(), target.getControllerId()).content(objectMapper.writeValueAsString(body)) - .contentType(MediaType.APPLICATION_JSON_UTF8)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID)), - requestFields( - optionalRequestFieldWithPath("initiator") - .description(DdiApiModelProperties.TARGET_AUTO_CONFIRM_ACTIVATE_INITIATOR), - optionalRequestFieldWithPath("remark") - .description(DdiApiModelProperties.TARGET_AUTO_CONFIRM_ACTIVATE_REMARK)))); - } - - @Test - @Description("Resource to deactivate auto-confirmation on a target.") - @WithUser(tenantId = "TENANT_ID", authorities = "ROLE_CONTROLLER", allSpPermissions = true) - public void deactivateAutoConfirmation() throws Exception { - final Target target = targetManagement.create(entityFactory.target().create().controllerId(CONTROLLER_ID)); - - mockMvc.perform(post( - DdiRestConstants.BASE_V1_REQUEST_MAPPING + "/{controllerId}/" + DdiRestConstants.CONFIRMATION_BASE + "/" - + DdiRestConstants.AUTO_CONFIRM_DEACTIVATE, - tenantAware.getCurrentTenant(), target.getControllerId())).andDo(MockMvcResultPrinter.print()) - .andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("tenant").description(ApiModelPropertiesGeneric.TENANT), - parameterWithName("controllerId").description(DdiApiModelProperties.CONTROLLER_ID)))); - } - -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/AbstractApiRestDocumentation.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/AbstractApiRestDocumentation.java deleted file mode 100644 index 8d65942755..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/AbstractApiRestDocumentation.java +++ /dev/null @@ -1,384 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.documentation; - -import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; -import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest; -import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse; -import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; -import static org.springframework.restdocs.request.RequestDocumentation.requestParameters; -import static org.springframework.restdocs.snippet.Attributes.key; - -import java.io.ByteArrayInputStream; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -import org.apache.commons.lang3.RandomStringUtils; -import org.eclipse.hawkbit.ddi.rest.resource.DdiApiConfiguration; -import org.eclipse.hawkbit.mgmt.rest.resource.MgmtApiConfiguration; -import org.eclipse.hawkbit.repository.DeploymentManagement; -import org.eclipse.hawkbit.repository.jpa.RepositoryApplicationConfiguration; -import org.eclipse.hawkbit.repository.model.Action; -import org.eclipse.hawkbit.repository.model.Action.ActionType; -import org.eclipse.hawkbit.repository.model.Action.Status; -import org.eclipse.hawkbit.repository.model.ArtifactUpload; -import org.eclipse.hawkbit.repository.model.DeploymentRequestBuilder; -import org.eclipse.hawkbit.repository.model.DistributionSet; -import org.eclipse.hawkbit.repository.model.Rollout; -import org.eclipse.hawkbit.repository.model.Target; -import org.eclipse.hawkbit.repository.model.TargetType; -import org.eclipse.hawkbit.repository.model.TargetUpdateStatus; -import org.eclipse.hawkbit.repository.test.TestConfiguration; -import org.eclipse.hawkbit.rest.AbstractRestIntegrationTest; -import org.eclipse.hawkbit.rest.RestConfiguration; -import org.eclipse.hawkbit.rest.util.FilterHttpResponse; -import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties.TenantConfigurationKey; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.extension.ExtendWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.stream.test.binder.TestSupportBinderAutoConfiguration; -import org.springframework.restdocs.RestDocumentationContextProvider; -import org.springframework.restdocs.RestDocumentationExtension; -import org.springframework.restdocs.mockmvc.MockMvcRestDocumentation; -import org.springframework.restdocs.mockmvc.RestDocumentationResultHandler; -import org.springframework.restdocs.payload.FieldDescriptor; -import org.springframework.restdocs.payload.SubsectionDescriptor; -import org.springframework.restdocs.snippet.Snippet; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.collect.Lists; - -import io.qameta.allure.Feature; - -/** - * Parent class for all Management API rest documentation classes. - * - */ -@Feature("Documentation Verification - API") -@ExtendWith(RestDocumentationExtension.class) -@ContextConfiguration(classes = { DdiApiConfiguration.class, MgmtApiConfiguration.class, RestConfiguration.class, - RepositoryApplicationConfiguration.class, TestConfiguration.class, - TestSupportBinderAutoConfiguration.class }) -@TestPropertySource(locations = { "classpath:/updateserver-restdocumentation-test.properties" }) -public abstract class AbstractApiRestDocumentation extends AbstractRestIntegrationTest { - - @Autowired - protected ObjectMapper objectMapper; - - @Autowired - private FilterHttpResponse filterHttpResponse; - - protected MockMvc mockMvc; - - protected RestDocumentationResultHandler document; - - protected String arrayPrefix; - - protected String host = "management-api.host"; - - /** - * The generated REST docs snippets will be outputted to an own resource - * folder. The child class has to specify the name of that output folder - * where to put its corresponding snippets. - * - * @return the name of the resource folder - */ - public abstract String getResourceName(); - - @BeforeEach - protected void setupMvc(final RestDocumentationContextProvider restDocContext) { - this.document = document(getResourceName() + "/{method-name}", preprocessRequest(prettyPrint()), - preprocessResponse(prettyPrint())); - this.mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext) - .apply(MockMvcRestDocumentation.documentationConfiguration(restDocContext).uris().withScheme("https") - .withHost(host + ".com").withPort(443)) - .alwaysDo(this.document).addFilter(filterHttpResponse).build(); - arrayPrefix = "[]"; - } - - public static MyFieldFieldDesc requestFieldWithPath(final String path, final boolean mandatory) { - return requestFieldWithPath(path, mandatory, mandatory ? "X" : ""); - } - - private static MyFieldFieldDesc requestFieldWithPath(final String path, final boolean mandatory, - final String mandatoryMessage) { - final MyFieldFieldDesc myFieldDesc = new MyFieldFieldDesc(path); - myFieldDesc.attributes(key("mandatory").value(mandatoryMessage)); - // defaults - myFieldDesc.attributes(key("value").value("")); - - if (!mandatory) { - myFieldDesc.optional(); - } - - return myFieldDesc; - } - - public static MyFieldFieldDesc requestFieldWithPath(final String path) { - return requestFieldWithPath(path, true); - } - - protected static MyFieldFieldDesc optionalRequestFieldWithPath(final String path) { - return requestFieldWithPath(path, false); - } - - public static MyFieldFieldDesc requestFieldWithPathMandatoryInMultiAssignMode(final String path) { - return requestFieldWithPath(path, false, "when multi-assignment is enabled"); - } - - public static class MyFieldFieldDesc extends SubsectionDescriptor { - - /** - * @param path - */ - protected MyFieldFieldDesc(final String path) { - super(path); - } - } - - /** - * Wrapper for FieldDescriptor adding attribute with a key named value if - * not set. - * - * @param path - * @return FieldDescriptor with value key - */ - public static FieldDescriptor fieldWithPath(final String path) { - final MyFieldFieldDesc myFieldDesc = new MyFieldFieldDesc(path); - // defaults - myFieldDesc.attributes(key("value").value("")); - return myFieldDesc; - } - - protected Target createTargetByGivenNameWithAttributes(final String name, final boolean inSync, - final boolean timeforced, final DistributionSet distributionSet) { - return createTargetByGivenNameWithAttributes(name, inSync, timeforced, distributionSet, null, null, null, - false); - } - - protected Target createTargetByGivenNameWithAttributes(final String name, final boolean inSync, - final boolean timeforced, final DistributionSet distributionSet, final boolean createRollout) { - return createTargetByGivenNameWithAttributes(name, inSync, timeforced, distributionSet, null, null, null, - createRollout); - } - - protected Target createTargetByGivenNameWithAttributes(final String name, final boolean inSync, - final boolean timeforced, final DistributionSet distributionSet, final String maintenanceWindowSchedule, - final String maintenanceWindowDuration, final String maintenanceWindowTimeZone, - final boolean createRollout) { - - final TargetType targetType = testdataFactory.findOrCreateTargetType("defaultType"); - targetTypeManagement.assignCompatibleDistributionSetTypes(targetType.getId(), - Collections.singletonList(distributionSet.getType().getId())); - final Target savedTarget = targetManagement.create(entityFactory.target().create().controllerId(name) - .status(TargetUpdateStatus.UNKNOWN).address("http://192.168.0.1").description("My name is " + name) - .targetType(targetType.getId()).lastTargetQuery(System.currentTimeMillis())); - - final List updatedTargets; - if (createRollout) { - - final Rollout rollout = testdataFactory.createRolloutByVariables("rollout", "rollout desc", 1, - "name==" + name, distributionSet, "50", "5", timeforced ? ActionType.TIMEFORCED : ActionType.FORCED, - isMultiAssignmentsEnabled() ? 600 : null, isConfirmationFlowActive()); - - // start the rollout and handle it - rolloutManagement.start(rollout.getId()); - rolloutHandler.handleAll(); - - updatedTargets = Collections.singletonList(savedTarget); - - } else { - final DeploymentRequestBuilder deploymentRequestBuilder = DeploymentManagement - .deploymentRequest(savedTarget.getControllerId(), distributionSet.getId()) - .setMaintenance(maintenanceWindowSchedule, maintenanceWindowDuration, maintenanceWindowTimeZone); - - if (timeforced) { - deploymentRequestBuilder.setActionType(ActionType.TIMEFORCED); - } - - if (isMultiAssignmentsEnabled()) { - deploymentRequestBuilder.setWeight(600); - } - - updatedTargets = makeAssignment(deploymentRequestBuilder.build()).getAssignedEntity().stream() - .map(Action::getTarget).collect(Collectors.toList()); - } - - if (inSync) { - feedbackToByInSync(distributionSet); - } - - return updatedTargets.get(0); - } - - protected DistributionSet createDistributionSet() { - DistributionSet distributionSet = testdataFactory.createDistributionSet(""); - distributionSet = distributionSetManagement.update(entityFactory.distributionSet() - .update(distributionSet.getId()).description("The descption of the distribution set.")); - - distributionSet.getModules().forEach(module -> { - final byte[] random = RandomStringUtils.random(5).getBytes(); - artifactManagement - .create(new ArtifactUpload(new ByteArrayInputStream(random), module.getId(), "file1", false, 0)); - softwareModuleManagement.update(entityFactory.softwareModule().update(module.getId()) - .description("Description of the software module")); - }); - - return distributionSet; - } - - /* - * helper method to give feedback mark an target IN_SNCY * - */ - private void feedbackToByInSync(final DistributionSet savedSet) { - final Action action = deploymentManagement.findActionsByDistributionSet(PAGE, savedSet.getId()).getContent() - .get(0); - - controllerManagement - .addUpdateActionStatus(entityFactory.actionStatus().create(action.getId()).status(Status.FINISHED)); - } - - protected void provideCodeFeedback(final Action action, final int code) { - controllerManagement.addUpdateActionStatus( - entityFactory.actionStatus().create(action.getId()).code(code).status(Status.RUNNING)); - } - - protected Target createTargetByGivenNameWithAttributes(final String name, final DistributionSet distributionSet) { - return createTargetByGivenNameWithAttributes(name, true, false, distributionSet); - } - - protected String getArrayPrefix(final boolean isArray) { - return isArray ? arrayPrefix : ""; - } - - protected Snippet getResponseFieldTarget(final boolean isArray, final FieldDescriptor... descriptors) { - final String fieldArrayPrefix = getArrayPrefix(isArray); - - final List fields = Lists.newArrayList( - fieldWithPath(fieldArrayPrefix + "createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath(fieldArrayPrefix + "address").description(MgmtApiModelProperties.ADDRESS), - fieldWithPath(fieldArrayPrefix + "createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath(fieldArrayPrefix + "name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath(fieldArrayPrefix + "description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath(fieldArrayPrefix + "controllerId").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath(fieldArrayPrefix + "updateStatus").description(MgmtApiModelProperties.UPDATE_STATUS) - .type("enum") - .attributes(key("value").value("['error', 'in_sync', 'pending', 'registered', 'unknown']")), - fieldWithPath(fieldArrayPrefix + "securityToken").description(MgmtApiModelProperties.SECURITY_TOKEN), - fieldWithPath(fieldArrayPrefix + "requestAttributes") - .description(MgmtApiModelProperties.REQUEST_ATTRIBUTES), - fieldWithPath(fieldArrayPrefix + "autoConfirmActive") - .description(MgmtApiModelProperties.AUTO_CONFIRM_ACTIVE), - fieldWithPath(fieldArrayPrefix + "installedAt").description(MgmtApiModelProperties.INSTALLED_AT), - fieldWithPath(fieldArrayPrefix + "lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT).type("Number"), - fieldWithPath(fieldArrayPrefix + "lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY).type("String"), - fieldWithPath(fieldArrayPrefix + "ipAddress").description(MgmtApiModelProperties.IP_ADDRESS) - .type("String"), - fieldWithPath(fieldArrayPrefix + "lastControllerRequestAt") - .description(MgmtApiModelProperties.LAST_REQUEST_AT).type("Number"), - fieldWithPath(fieldArrayPrefix + "cleanedUp") - .description(MgmtApiModelProperties.IS_CLEANED_UP), - fieldWithPath(fieldArrayPrefix + "isCleanedUp") - .description(MgmtApiModelProperties.IS_CLEANED_UP), - fieldWithPath(fieldArrayPrefix + "targetType").description(MgmtApiModelProperties.TARGETTYPE_ID) - .type("Number"), - fieldWithPath(fieldArrayPrefix + "targetTypeName").description(MgmtApiModelProperties.TARGETTYPE_NAME) - .type("String"), - fieldWithPath(fieldArrayPrefix + "_links.self").ignored()); - - if (!isArray) { - fields.addAll(Arrays.asList( - fieldWithPath(fieldArrayPrefix + "pollStatus").description(MgmtApiModelProperties.POLL_STATUS), - fieldWithPath(fieldArrayPrefix + "pollStatus.lastRequestAt") - .description(MgmtApiModelProperties.POLL_LAST_REQUEST_AT), - fieldWithPath(fieldArrayPrefix + "pollStatus.nextExpectedRequestAt") - .description(MgmtApiModelProperties.POLL_NEXT_EXPECTED_REQUEST_AT), - fieldWithPath(fieldArrayPrefix + "pollStatus.overdue") - .description(MgmtApiModelProperties.POLL_OVERDUE), - fieldWithPath(fieldArrayPrefix + "_links.assignedDS") - .description(MgmtApiModelProperties.LINKS_ASSIGNED_DS), - fieldWithPath(fieldArrayPrefix + "_links.installedDS") - .description(MgmtApiModelProperties.LINKS_INSTALLED_DS), - fieldWithPath(fieldArrayPrefix + "_links.attributes") - .description(MgmtApiModelProperties.LINKS_ATTRIBUTES), - fieldWithPath(fieldArrayPrefix + "_links.actions") - .description(MgmtApiModelProperties.LINKS_ACTIONS), - fieldWithPath(fieldArrayPrefix + "_links.metadata").description(MgmtApiModelProperties.META_DATA), - fieldWithPath(fieldArrayPrefix + "_links.targetType") - .description(MgmtApiModelProperties.LINK_TO_TARGET_TYPE), - fieldWithPath(fieldArrayPrefix + "_links.autoConfirm") - .description(MgmtApiModelProperties.LINK_TO_AUTO_CONFIRM))); - - } - fields.addAll(Arrays.asList(descriptors)); - - return responseFields(fields); - } - - protected Snippet getResponseFieldsDistributionSet(final boolean isArray, final FieldDescriptor... descriptors) { - final String arrayPrefix = getArrayPrefix(isArray); - final List fields = Lists.newArrayList( - fieldWithPath(arrayPrefix + "id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath(arrayPrefix + "name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath(arrayPrefix + "description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath(arrayPrefix + "createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath(arrayPrefix + "createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath(arrayPrefix + "lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY), - fieldWithPath(arrayPrefix + "lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT), - fieldWithPath(arrayPrefix + "type").description(MgmtApiModelProperties.DS_TYPE), - fieldWithPath(arrayPrefix + "typeName").description(MgmtApiModelProperties.DS_TYPE_NAME), - fieldWithPath(arrayPrefix + "requiredMigrationStep") - .description(MgmtApiModelProperties.DS_REQUIRED_STEP), - fieldWithPath(arrayPrefix + "complete").description(MgmtApiModelProperties.DS_COMPLETE), - fieldWithPath(arrayPrefix + "deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath(arrayPrefix + "valid").description(MgmtApiModelProperties.DS_VALID), - fieldWithPath(arrayPrefix + "version").description(MgmtApiModelProperties.VERSION), - fieldWithPath(arrayPrefix + "_links.self").ignored(), fieldWithPath(arrayPrefix + "modules").ignored()); - - fields.addAll(Arrays.asList(descriptors)); - - if (!isArray) { - fields.add(fieldWithPath(arrayPrefix + "_links.type").description(MgmtApiModelProperties.DS_TYPE)); - fields.add(fieldWithPath(arrayPrefix + "_links.metadata").description(MgmtApiModelProperties.META_DATA)); - fields.add(fieldWithPath(arrayPrefix + "_links.modules").description(MgmtApiModelProperties.SM_LIST)); - } - - return responseFields(fields); - } - - protected Snippet getFilterRequestParamter() { - return requestParameters( - parameterWithName("limit").attributes(key("type").value("query")) - .description(ApiModelPropertiesGeneric.LIMIT), - parameterWithName("sort").description(ApiModelPropertiesGeneric.SORT), - parameterWithName("offset").description(ApiModelPropertiesGeneric.OFFSET), - parameterWithName("q").description(ApiModelPropertiesGeneric.FIQL)); - } - - protected boolean isMultiAssignmentsEnabled() { - return Boolean.TRUE.equals(tenantConfigurationManagement - .getConfigurationValue(TenantConfigurationKey.MULTI_ASSIGNMENTS_ENABLED, Boolean.class).getValue()); - } - - protected boolean isConfirmationFlowActive() { - return Boolean.TRUE.equals(tenantConfigurationManagement - .getConfigurationValue(TenantConfigurationKey.USER_CONFIRMATION_ENABLED, Boolean.class).getValue()); - } - -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/ApiModelPropertiesGeneric.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/ApiModelPropertiesGeneric.java deleted file mode 100644 index 3420e066fa..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/ApiModelPropertiesGeneric.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.documentation; - -/** - * Constants for API documentation. - */ -public final class ApiModelPropertiesGeneric { - public static final String ENDING = " of the entity"; - - // generic - public static final String TENANT = "The tenant"; - public static final String ITEM_ID = "The technical identifier " + ENDING; - public static final String NAME = "The name" + ENDING; - public static final String DESCRPTION = "The description" + ENDING; - public static final String COLOUR = "The colour" + ENDING; - public static final String DELETED = "Deleted flag, used for soft deleted entities"; - - public static final String CREATED_BY = "Entity was originally created by (User, AMQP-Controller, anonymous etc.)"; - public static final String CREATED_AT = "Entity was originally created at (timestamp UTC in milliseconds)"; - public static final String LAST_MODIFIED_BY = "Entity was last modified by (User, AMQP-Controller, anonymous etc.)"; - public static final String LAST_MODIFIED_AT = "Entity was last modified at (timestamp UTC in milliseconds)"; - - // Paging elements - public static final String SIZE = "Current page size"; - public static final String TOTAL_ELEMENTS = "Total number of elements"; - public static final String SELF_LINKS_TO_RESOURCE = "Links to the given resource itself"; - - private ApiModelPropertiesGeneric() { - // utility class - } - - // parameters - public static final String OFFSET = "The paging offset (default is 0)."; - public static final String LIMIT = "The maximum number of entries in a page (default is 50)."; - public static final String SORT = "The query parameter sort allows to define the sort order for the result of a query. " - + "A sort criteria consists of the name of a field and the sort direction (ASC for ascending and DESC descending). " - + "The sequence of the sort criteria (multiple can be used) defines the sort order of the entities in the result."; - public static final String FIQL = "Query fields based on the Feed Item Query Language (FIQL). See Entity Definitions for available fields."; - - // Error/exception handling - public static final String EXCEPTION_CLASS = "The exception class name."; - public static final String ERROR_CODE = "The exception error code."; - public static final String ERROR_MESSAGE = "The exception human readable message."; - public static final String ERROR_PARAMETERS = "The exception message parameters."; - -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/DocumenationResponseFieldsSnippet.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/DocumenationResponseFieldsSnippet.java deleted file mode 100644 index 9dd0c45b55..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/DocumenationResponseFieldsSnippet.java +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.documentation; - -import java.util.List; - -import org.springframework.restdocs.payload.FieldDescriptor; -import org.springframework.restdocs.payload.ResponseFieldsSnippet; - -/** - * {@link ResponseFieldsSnippet} with public constructor - */ -public class DocumenationResponseFieldsSnippet extends ResponseFieldsSnippet { - public DocumenationResponseFieldsSnippet(final List descriptors) { - super(descriptors); - } - -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/MgmtApiModelProperties.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/MgmtApiModelProperties.java deleted file mode 100644 index eae401b52b..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/documentation/MgmtApiModelProperties.java +++ /dev/null @@ -1,286 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.documentation; - -/** - * Model properties for the Management API documentation. - */ -public final class MgmtApiModelProperties { - - // Versioned entity - public static final String VERSION = "Package version."; - public static final String VENDOR = "The software vendor."; - - public static final String ACTION_ID = "ID of the action."; - - public static final String LINKS_ASSIGNED_DS = "Links to assigned distribution sets."; - public static final String LINKS_INSTALLED_DS = "Links to installed distribution sets."; - public static final String LINKS_ATTRIBUTES = "Links to attributes of the target."; - public static final String LINKS_ACTIONS = "Links to actions of the target."; - public static final String LINK_TO_ACTION = "The link to the action."; - public static final String LINK_TO_DS = "The link to the distribution set."; - public static final String LINKS_ACTION_STATUSES = "The link to all statuses of the action."; - public static final String LINK_TO_ARTIFACTS = "The link to all artifact of a software module."; - public static final String LINK_TO_SM_TYPE = "The link to the software module type."; - public static final String LINK_TO_METADATA = "The link to the metadata."; - public static final String LINK_TO_MANDATORY_SMT = "Link to mandatory software modules types in this distribution set type."; - public static final String LINK_TO_OPTIONAL_SMT = "Link to optional software modules types in this distribution set type."; - public static final String LINK_TO_ROLLOUT = "The link to the rollout."; - public static final String LINK_TO_TARGET_TYPE = "The link to the target type."; - public static final String LINK_TO_TARGET = "The link to the target."; - - public static final String LINK_TO_AUTO_CONFIRM = "The link to the detailed auto confirm state."; - - // software module types - public static final String SMT_TYPE = "The type of the software module identified by its key."; - public static final String SMT_VENDOR = "The software vendor of the entity."; - public static final String SMT_VERSION = "The version of the software module type."; - public static final String SMT_KEY = "The key of the software module type."; - public static final String SMT_MAX_ASSIGNMENTS = "Software modules of that type can be assigned at this maximum number (e.g. operating system only once)."; - - // software module - public static final String SM_TYPE = "The software module type " + ApiModelPropertiesGeneric.ENDING; - public static final String SM_TYPE_NAME = "The software module type name " + ApiModelPropertiesGeneric.ENDING; - public static final String ENCRYPTED = "Encryption flag, used to identify that artifacts should be encrypted upon upload."; - public static final String ARTIFACT_HASHES = "Hashes of the artifact."; - public static final String ARTIFACT_SIZE = "Size of the artifact."; - public static final String ARTIFACT_PROVIDED_FILE = "Binary of file."; - public static final String ARTIFACT_PROVIDED_FILENAME = "Filename of the artifact."; - public static final String ARTIFACT_HASHES_SHA1 = "SHA1 hash of the artifact."; - public static final String ARTIFACT_HASHES_MD5 = "MD5 hash of the artifact."; - public static final String ARTIFACT_HASHES_SHA256 = "SHA256 hash of the artifact."; - public static final String ARTIFACT_DOWNLOAD_LINK = "Download link of the artifact based on the chosen download url type parameter."; - public static final String ARTIFACT_LIST = "List of artifacts of given software module."; - public static final String ARTIFACT_DOWNLOAD_USE_URL_HANDLER = "Indicates if the artifact URL handler should be used e.g. for external links."; - - // Distribution Set - public static final String DS_OS = "Operating system or firmware software module - DEPRECATED (use modules)."; - public static final String DS_RUNTIME = "Runtime software module (e.g. JVM) - DEPRECATED (use modules)."; - public static final String DS_APPLICATION = "Application software module (e.g. OSGi container) - DEPRECATED (use modules)."; - public static final String DS_MODULES = "Software modules (e.g. OSGi bundles, runtimes)."; - public static final String DS_REQUIRED_STEP = "True if DS is a required migration step for another DS. As a result the DS's assignment will not be cancelled when another DS is assigned (note: updatable only if DS is not yet assigned to a target)"; - public static final String DS_ASSIGNED_TARGETS = "Targets that have this distribution set assigned."; - public static final String DS_INSTALLED_TARGETS = "Targets that have this distribution set installed."; - public static final String DS_LIST = "List of distribution sets."; - public static final String DS_TAG_LIST = "List of distribution set tags"; - public static final String DS_NEW_ASSIGNED_TARGETS = "Targets that now have this distribution set assigned."; - public static final String DS_ALREADY_ASSIGNED_TARGETS = "Targets that had this distribution set already assigned (in \"offline\" case this includes targets that have arbitrary updates running)"; - public static final String DS_TOTAL_ASSIGNED_TARGETS = "Overall assigned as part of this request."; - public static final String DS_ID = "Id of the distribution set."; - public static final String DS_INVALIDATION_ACTION_CANCELATION_TYPE = "Type of cancelation for actions referring to the given distribution set."; - public static final String DS_INVALIDATION_CANCEL_ROLLOUTS = "Defines if rollouts referring to this distribution set should be canceled."; - - // Target - public static final String INSTALLED_AT = "Installation time of current installed DistributionSet."; - - public static final String LAST_REQUEST_AT = "Last time where the target polled the server, same as pollStatus.lastRequestAt."; - // poll status - public static final String POLL_LAST_REQUEST_AT = "Last time when the target polled the server."; - public static final String POLL_NEXT_EXPECTED_REQUEST_AT = "Next expected time when the target polls the server."; - public static final String POLL_STATUS = "Poll status of the target. In many scenarios that target will poll the update server on a regular basis to look for potential updates. If that poll does not happen it might imply that the target is offline."; - public static final String POLL_OVERDUE = "Defines if the target poll time is overdue based on the next expected poll time plus the configured overdue poll time threshold."; - - // Target type - public static final String TARGETTYPE_ID = "ID of the target type"; - public static final String TARGETTYPE_NAME = "Name of the target type"; - public static final String COMPATIBLE_DS_TYPES = "Array of distribution set types that are compatible to that target type"; - public static final String LINK_COMPATIBLE_DS_TYPES = "Link to the compatible distribution set types in this target type"; - - // rollout - public static final String ROLLOUT_FILTER_QUERY = "target filter query language expression"; - public static final String ROLLOUT_CONFIRMATION_REQUIRED = "(available with user consent flow active) if the confirmation is required for this rollout. Value will be used if confirmation options are missing in the rollout group definitions. Confirmation is required per default"; - public static final String ROLLOUT_GROUP_CONFIRMATION_REQUIRED = "(available with user consent flow active) if the confirmation is required for this rollout group. Confirmation is required per default."; - public static final String ROLLOUT_GROUP_FILTER_QUERY = "target filter query language expression that selects a subset of targets which match the target filter of the Rollout"; - public static final String ROLLOUT_GROUP_TARGET_PERCENTAGE = "percentage of remaining and matching targets that should be added to this group"; - public static final String ROLLOUT_DS_ID = "the ID of distributionset of this rollout"; - public static final String ROLLOUT_TOTAL_TARGETS = "the total targets of a rollout"; - public static final String ROLLOUT_TOTAL_TARGETS_PER_STATUS = "the total targets per status"; - - public static final String ROLLOUT_TOTAL_GROUPS = "the total number of groups created by this rollout"; - public static final String ROLLOUT_STATUS = "the status of this rollout"; - public static final String ROLLOUT_TYPE = "the type of this rollout"; - public static final String ROLLOUT_GROUP_STATUS = "the status of this rollout group"; - public static final String ROLLOUT_AMOUNT_GROUPS = "the amount of groups the rollout should split targets into"; - public static final String ROLLOUT_GROUPS = "the list of group definitions"; - public static final String ROLLOUT_SUCCESS_CONDITION = "the success condition which takes in place to evaluate if a rollout group is successful and so the next group can be started"; - public static final String ROLLOUT_SUCCESS_CONDITION_CONDITION = "the type of the condition"; - public static final String ROLLOUT_SUCCESS_CONDITION_EXP = "the expression according to the condition, e.g. the value of threshold in percentage"; - public static final String ROLLOUT_SUCCESS_ACTION = "the success action which takes in place to execute in case the success action is fulfilled"; - public static final String ROLLOUT_SUCCESS_ACTION_ACTION = "the success action to execute"; - public static final String ROLLOUT_SUCCESS_ACTION_EXP = "the expression for the success action"; - public static final String ROLLOUT_ERROR_CONDITION = "the error condition which takes in place to evaluate if a rollout group encounter errors"; - public static final String ROLLOUT_ERROR_CONDITION_CONDITION = "the type of the condition"; - public static final String ROLLOUT_ERROR_CONDITION_EXP = "the expression according to the condition, e.g. the value of threshold in percentage"; - public static final String ROLLOUT_ERROR_ACTION = "the error action which is executed if the error condition is fulfilled"; - public static final String ROLLOUT_ERROR_ACTION_ACTION = "the error action to execute"; - public static final String ROLLOUT_ERROR_ACTION_EXP = "the expression for the error action"; - public static final String ROLLOUT_LINKS_START_SYNC = "Link to start the rollout in sync mode"; - public static final String ROLLOUT_LINKS_START_ASYNC = "Link to start the rollout in async mode"; - public static final String ROLLOUT_LINKS_PAUSE = "Link to pause a running rollout"; - public static final String ROLLOUT_LINKS_TRIGGER_NEXT_GROUP = "Link for triggering next rollout group on a running rollout"; - public static final String ROLLOUT_LINKS_RESUME = "Link to resume a paused rollout"; - public static final String ROLLOUT_LINKS_APPROVE = "Link to approve a rollout"; - public static final String ROLLOUT_LINKS_DENY = "Link to deny a rollout"; - public static final String ROLLOUT_LINKS_GROUPS = "Link to retrieve the groups a rollout"; - public static final String ROLLOUT_START_ASYNC = "Start the rollout asynchronous"; - public static final String ROLLOUT_START_AT = "Start at timestamp of Rollout."; - - - public static final String RESULTING_ACTIONS_WEIGHT = "Weight of the resulting Actions"; - - public static final String UPDATE_STATUS = "Current update status of the target."; - public static final String TARGET_ATTRIBUTES = "Target attributes."; - - public static final String TARGET_LIST = "List of provisioning targets."; - - public static final String TARGET_TAG_LIST = "List of target tags"; - - public static final String TARGET_TYPE_LIST = "List of target types"; - - public static final String SM_LIST = "List of software modules."; - - public static final String ROLLOUT_LIST = "list of rollouts"; - - public static final String ACTION_TYPE = "Type of action."; - - public static final String ACTION_FORCE_TYPE = "Force type of the action that provides a hint if the controller should apply the action immediately or whenever possible."; - - public static final String ACTION_CONFIRMATION_REQUIRED = "(Available with user consent flow active) Defines, if the confirmation is required for an action. Confirmation is required per default."; - - public static final String ACTION_FORCE_TIME = "In case of timeforced mode the difference, measured in milliseconds, between the time the action should switch to forced and midnight, January 1, 1970 UTC."; - - public static final String ACTION_FORCED = "Set to forced in order to switch action to forced mode."; - - public static final String ACTION_STATUS_TYPE = "Type of the action status."; - - public static final String ACTION_STATUS_MESSAGES = "Messages related to the status."; - - public static final String ACTION_STATUS_REPORTED_AT = "Time at which the status was reported (server time)."; - - public static final String ACTION_STATUS_CODE = "(Optional) Code provided by the device related to the status."; - - public static final String ACTION_LAST_STATUS_CODE = "(Optional) Code provided as part of the last status update that was sent by the device."; - - public static final String ACTION_STATUS_LIST = "List of action status."; - - public static final String ACTION_EXECUTION_STATUS = "Status of action."; - - public static final String ACTION_DETAIL_STATUS = "Detailed status of action."; - - public static final String ACTION_LIST = "List of actions."; - - public static final String ACTION_WEIGHT = "Weight of the action showing the importance of the update."; - - public static final String ACTION_ROLLOUT = "The ID of the rollout this action was created for."; - - public static final String ACTION_ROLLOUT_NAME = "The name of the rollout this action was created for."; - - public static final String IP_ADDRESS = "Last known IP address of the target. Only presented if IP address of the target itself is known (connected directly through DDI API)."; - - public static final String ADDRESS = "The last known address URI of the target. Includes information of the target is connected either directly (DDI) through HTTP or indirectly (DMF) through amqp."; - - public static final String SECURITY_TOKEN = "Pre-Shared key that allows targets to authenticate at Direct Device Integration API if enabled in the tenant settings."; - - public static final String REQUEST_ATTRIBUTES = "Request re-transmission of target attributes."; - - public static final String IS_CLEANED_UP = "A flag that indicates if the target's action statuses and action status messages require cleanup."; - - public static final String AUTO_CONFIRM_ACTIVE = "Present if user consent flow active. Indicates if auto-confirm is active"; - - public static final String META_DATA = "List of metadata."; - - public static final String META_DATA_KEY = "Metadata property key."; - - public static final String META_DATA_VALUE = "Metadata property value."; - - public static final String SM_META_DATA_TARGET_VISIBLE = "Metadata property is visible to targets as part of software update action."; - - public static final String AUTO_CONFIRM_STATE_ACTIVE = "Flag if auto confirm is active"; - - public static final String AUTO_CONFIRM_STATE_INITIATOR = "(Optional) initiator set on activation"; - - public static final String AUTO_CONFIRM_STATE_REMARK = "(Optional) remark set on activation"; - - public static final String AUTO_CONFIRM_STATE_ACTIVATED_AT = "timestamp of the activation"; - - public static final String AUTO_CONFIRM_STATE_REFERENCE_ACTIVATE_AUTO_CONFIRM = "reference link to activate auto confirm (present if not active)"; - - public static final String AUTO_CONFIRM_STATE_REFERENCE_DEACTIVATE_AUTO_CONFIRM = "reference link to deactivate auto confirm (present if active)"; - - public static final String AUTO_CONFIRM_ACTIVATE_INITIATOR = "individual value (e.g. username) stored as initiator and automatically used as confirmed user in future actions"; - public static final String AUTO_CONFIRM_ACTIVATE_REMARK = "individual value to attach a remark which will be persisted when automatically confirming future actions"; - - public static final String SM_TYPE_KEY = "Key that can be interpreted by the target."; - - public static final String SM_MAX_ASSIGNMENTS = "Maximum number of assignments to a distribution set/target, e.g. only one firmware but multiple applications."; - - public static final String SM_TYPE_LIST = "List of software modules types."; - - public static final String DS_TYPE_KEY = "Functional key of the distribution set type."; - - public static final String DS_TYPE_LIST = "List of distribution set types."; - - public static final String DS_TYPE = "The type of the distribution set."; - - public static final String DS_TYPE_NAME = "The type name of the distribution set."; - - public static final String DS_COMPLETE = "True of the distribution set software module setup is complete as defined by the distribution set type."; - - public static final String DS_VALID = "True by default and false after the distribution set is invalidated by the user."; - - public static final String DS_TYPE_MANDATORY_MODULES = "Mandatory module type IDs."; - - public static final String DS_TYPE_OPTIONAL_MODULES = "Optional module type IDs."; - - public static final String MAINTENANCE_WINDOW = "Separation of download and install by defining a maintenance window for the installation."; - public static final String MAINTENANCE_WINDOW_SCHEDULE = "Schedule for the maintenance window start in quartz cron notation, such as '0 15 10 * * ? 2018' for 10:15am every day during the year 2018."; - public static final String MAINTENANCE_WINDOW_DURATION = "Duration of the window, such as '02:00:00' for 2 hours."; - public static final String MAINTENANCE_WINDOW_TIMEZONE = "A time-zone offset from Greenwich/UTC, such as '+02:00'."; - public static final String MAINTENANCE_WINDOW_NEXT_START_AT = "The time (timestamp UTC in milliseconds) of the next maintenance window start"; - - // target filter query - public static final String TARGET_FILTER_QUERY = "target filter query expression"; - public static final String TARGET_FILTER_QUERIES_LIST = "List of target filter queries."; - public static final String TARGET_FILTER_QUERY_AUTO_ASSIGN_DS_ID = "Auto assign distribution set id"; - public static final String TARGET_FILTER_QUERY_LINK_AUTO_ASSIGN_DS = "Link to manage the auto assign distribution set"; - public static final String TARGET_FILTER_QUERY_PARAM_Q = "Name filter"; - - // request parameter - public static final String FORCETIME = "Forcetime in milliseconds."; - public static final String FORCE = "Force as boolean."; - public static final String ASSIGNMENT_WEIGHT = "Importance of the assignment."; - public static final String ASSIGNMENT_CONFIRMATION_REQUIRED = "(Available with user consent flow active) Specifies if the confirmation by the device is required for this action."; - public static final String ASSIGNMENT_TYPE = "The type of the assignment."; - public static final String TARGET_ASSIGNED = "The number of targets that have been assigned as part of this operation."; - public static final String TARGET_ASSIGNED_ALREADY = "The number of targets which already had been the assignment."; - public static final String TARGET_ASSIGNED_TOTAL = "The total number of targets that are part of this operation."; - - public static final String ASSIGNED_TARGETS = "Assigned targets."; - public static final String UN_ASSIGNED_TARGETS = "Unassigned targets."; - public static final String LINKS_ASSIGNED_TARGETS = "Links to assigned targets."; - - public static final String ASSIGNED_DISTRIBUTION_SETS = "Assigned distribution sets."; - public static final String UN_ASSIGNED_DISTRIBUTION_SETS = "Unassigned distribution sets."; - public static final String LINKS_ASSIGNED_DISTRIBUTION_SETS = "Links to assigned distribution sets."; - public static final Object OFFLINE_UPDATE = "Offline update (set param to true) that is only reported but not managed by the service, " - + "e.g. defaults set in factory, manual updates or migrations from other update systems. A completed action is added to the history of the target(s)." - + " Target is set to IN_SYNC state as both assigend and installed DS are set. " - + "Note: only executed if the target has currently no running update."; - - // configuration - public static final String CONFIG_LIST = "List of all available configuration parameter."; - public static final String CONFIG_VALUE = "Current value of of configuration parameter."; - public static final String CONFIG_GLOBAL = "true - if the current value is the global configuration value, false - if there is a tenant specific value configured."; - public static final String CONFIG_PARAM = "The name of the configuration parameter."; - - public static final String DS_NEW_ASSIGNED_ACTIONS = "The newly created actions as a result of this assignment"; - - public static final String REPRESENTATION_MODE = "The representation mode. Can be \"full\" or \"compact\". Defaults to \"compact\""; - -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetTagResourceDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetTagResourceDocumentationTest.java deleted file mode 100644 index a0fb698000..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetTagResourceDocumentationTest.java +++ /dev/null @@ -1,307 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.mgmt.documentation; - -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.put; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; -import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtAssignedDistributionSetRequestBody; -import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTagRequestBodyPut; -import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; -import org.eclipse.hawkbit.repository.model.DistributionSet; -import org.eclipse.hawkbit.repository.model.DistributionSetTag; -import org.eclipse.hawkbit.rest.documentation.AbstractApiRestDocumentation; -import org.eclipse.hawkbit.rest.documentation.ApiModelPropertiesGeneric; -import org.eclipse.hawkbit.rest.documentation.DocumenationResponseFieldsSnippet; -import org.eclipse.hawkbit.rest.documentation.MgmtApiModelProperties; -import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.http.MediaType; -import org.springframework.restdocs.payload.FieldDescriptor; -import org.springframework.restdocs.payload.JsonFieldType; -import org.springframework.restdocs.snippet.Snippet; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import io.qameta.allure.Description; -import io.qameta.allure.Feature; -import io.qameta.allure.Story; - -/** - * Documentation generation for Management API for {@link DistributionSetTag}. - * - */ -@Feature("Spring Rest Docs Tests - DistributionSetTag") -@Story("DistributionSet Tag Resource") -public class DistributionSetTagResourceDocumentationTest extends AbstractApiRestDocumentation { - - private DistributionSet distributionSet; - - @Override - public String getResourceName() { - return "distributionsettag"; - } - - @BeforeEach - public void setUp() { - distributionSet = createDistributionSet(); - } - - @Test - @Description("Handles the GET request of retrieving all distribution set tags") - public void getDistributionSetTags() throws Exception { - createDistributionSetTag(); - arrayPrefix = "content[]."; - mockMvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING)).andExpect(status().isOk()) - .andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(getResponseFieldsTag(true, - fieldWithPath("size").type(JsonFieldType.NUMBER).description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("content").description(MgmtApiModelProperties.DS_TAG_LIST)))); - } - - @Test - @Description("Handles the GET request of retrieving all distribution set tags based by parameter") - public void getDistributionSetTagsWithParameters() throws Exception { - createDistributionSetTag(); - mockMvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING - + "?limit=10&sort=name:ASC&offset=0&q=name==DsTag")).andExpect(status().isOk()) - .andDo(MockMvcResultPrinter.print()).andDo(this.document.document(getFilterRequestParamter())); - } - - @Test - @Description("Handles the GET request of retrieving a single distribution set tag") - public void getDistributionSetTag() throws Exception { - final Long tagId = createDistributionSetTagId(); - - mockMvc.perform( - get(MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING + "/{distributionsetTagId}", tagId)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(pathParameters( - parameterWithName("distributionsetTagId").description(ApiModelPropertiesGeneric.ITEM_ID)), - getResponseFieldsTag(false))); - } - - @Test - @Description("Handles the POST request of creating new distribution set tag. The request body must always be a list of tags.") - public void createDistributionSetTags() throws Exception { - final MgmtTagRequestBodyPut bodyPut = createDSBody(); - final ObjectMapper mapper = new ObjectMapper(); - final String json = mapper.writeValueAsString(Arrays.asList(bodyPut)); - this.mockMvc - .perform(post(MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING).content(json) - .contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isCreated()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(getRequestFieldsTag(true), getResponseFieldsTag(true))); - } - - @Test - @Description("Handles the PUT request of updating a single distribution set tag.") - public void updateDistributionSetTag() throws Exception { - final Long tagId = createDistributionSetTagId(); - final MgmtTagRequestBodyPut bodyPut = createDSBody(); - final ObjectMapper mapper = new ObjectMapper(); - final String json = mapper.writeValueAsString(bodyPut); - - this.mockMvc - .perform( - put(MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING + "/{distributionsetTagId}", tagId) - .content(json).contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("distributionsetTagId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - getRequestFieldsTag(false), getResponseFieldsTag(false))); - - } - - private MgmtTagRequestBodyPut createDSBody() { - final MgmtTagRequestBodyPut bodyPut = new MgmtTagRequestBodyPut(); - bodyPut.setColour("red"); - bodyPut.setDescription("ds tag description"); - bodyPut.setName("ds tag"); - return bodyPut; - } - - @Test - @Description("Handles the DELETE request for a single distribution set tag") - public void deleteDistributionSetTag() throws Exception { - final Long tagId = createDistributionSetTagId(); - this.mockMvc - .perform(delete(MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING + "/{distributionsetTagId}", - tagId).contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(pathParameters( - parameterWithName("distributionsetTagId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the GET request of retrieving all assigned distribution sets by the given tag id.") - public void getAssignedDistributionSets() throws Exception { - final DistributionSetTag tag = createDistributionSetTag(); - distributionSetManagement.assignTag(Arrays.asList(distributionSet.getId()), tag.getId()); - - arrayPrefix = "content[]."; - this.mockMvc - .perform(get(MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING - + MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING, tag.getId()) - .contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("distributionsetTagId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - getResponseFieldsDistributionSet(true, - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("content").description(MgmtApiModelProperties.DS_TAG_LIST)))); - } - - @Test - @Description("andles the POST request to toggle the assignment of distribution sets by the given tag id.") - public void toggleTagAssignment() throws Exception { - final DistributionSet unassignDS = testdataFactory.createDistributionSet("unassign"); - final Long tagId = createDistributionSetTagId(); - final MgmtAssignedDistributionSetRequestBody body = new MgmtAssignedDistributionSetRequestBody(); - body.setDistributionSetId(distributionSet.getId()); - final ObjectMapper mapper = new ObjectMapper(); - final String json = mapper.writeValueAsString(Arrays.asList(body)); - - this.mockMvc - .perform(post(MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING - + MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING - + "/toggleTagAssignment", tagId).content(json).contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("distributionsetTagId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - getRequestFieldsDistributionSetAssignment(true), - getResponseAssignmentResult(distributionSet, unassignDS) - - )); - } - - @Test - @Description("Handles the POST request to assign distribution sets to the given tag id.") - public void assignDistributionSets() throws Exception { - final Long tagId = createDistributionSetTagId(); - final MgmtAssignedDistributionSetRequestBody body = new MgmtAssignedDistributionSetRequestBody(); - body.setDistributionSetId(distributionSet.getId()); - final ObjectMapper mapper = new ObjectMapper(); - final String json = mapper.writeValueAsString(Arrays.asList(body)); - - this.mockMvc - .perform(post(MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING - + MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING, tagId).content(json) - .contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("distributionsetTagId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - getRequestFieldsDistributionSetAssignment(true), getResponseFieldsDistributionSet(true))); - } - - @Test - @Description("Handles the DELETE request to unassign one distribution set from the given tag id.") - public void unassignDistributionSet() throws Exception { - final Long tagId = createDistributionSetTagId(); - - this.mockMvc - .perform(delete(MgmtRestConstants.DISTRIBUTIONSET_TAG_V1_REQUEST_MAPPING - + MgmtRestConstants.DISTRIBUTIONSET_TAG_DISTRIBUTIONSETS_REQUEST_MAPPING - + "/{distributionsetId}", tagId, distributionSet.getId()) - .contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(pathParameters( - parameterWithName("distributionsetTagId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("distributionsetId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - private Snippet getRequestFieldsTag(final boolean isArray) { - final String arrayPrefix = getArrayPrefix(isArray); - - return requestFields(requestFieldWithPath(arrayPrefix + "name").description(ApiModelPropertiesGeneric.NAME), - requestFieldWithPath(arrayPrefix + "description").description(ApiModelPropertiesGeneric.DESCRPTION), - optionalRequestFieldWithPath(arrayPrefix + "colour").description(ApiModelPropertiesGeneric.COLOUR)); - } - - private Snippet getRequestFieldsDistributionSetAssignment(final boolean isArray) { - final String arrayPrefix = getArrayPrefix(isArray); - - return requestFields(requestFieldWithPath(arrayPrefix + "id").description(ApiModelPropertiesGeneric.ITEM_ID)); - } - - private Snippet getResponseFieldsTag(final boolean isArray, final FieldDescriptor... descriptors) - throws JsonProcessingException { - final String arrayPrefix = getArrayPrefix(isArray); - final List allFieldDescriptor = new ArrayList<>(); - allFieldDescriptor.addAll(Arrays.asList(descriptors)); - - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "id").description(ApiModelPropertiesGeneric.ITEM_ID)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "name").description(ApiModelPropertiesGeneric.NAME)); - allFieldDescriptor - .add(fieldWithPath(arrayPrefix + "description").description(ApiModelPropertiesGeneric.DESCRPTION)); - allFieldDescriptor - .add(fieldWithPath(arrayPrefix + "createdBy").description(ApiModelPropertiesGeneric.CREATED_BY)); - allFieldDescriptor - .add(fieldWithPath(arrayPrefix + "createdAt").description(ApiModelPropertiesGeneric.CREATED_AT)); - allFieldDescriptor.add( - fieldWithPath(arrayPrefix + "lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY)); - allFieldDescriptor.add( - fieldWithPath(arrayPrefix + "lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "colour").description(ApiModelPropertiesGeneric.COLOUR)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "_links.self").ignored()); - - if (!isArray) { - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "_links.assignedDistributionSets") - .description(MgmtApiModelProperties.LINKS_ASSIGNED_DISTRIBUTION_SETS)); - } - - return new DocumenationResponseFieldsSnippet(allFieldDescriptor); - } - - private Snippet getResponseFieldsTag(final boolean isArray) throws JsonProcessingException { - return getResponseFieldsTag(isArray, new FieldDescriptor[0]); - } - - private Snippet getResponseAssignmentResult(final DistributionSet assignment, final DistributionSet unassignment) - throws JsonProcessingException { - return responseFields( - fieldWithPath("assignedDistributionSets").description(MgmtApiModelProperties.ASSIGNED_DISTRIBUTION_SETS) - .type("Array[Object]"), - - fieldWithPath("unassignedDistributionSets") - .description(MgmtApiModelProperties.UN_ASSIGNED_DISTRIBUTION_SETS).type("Array[Object]")); - } - - private DistributionSetTag createDistributionSetTag() { - final DistributionSetTag updateTag = distributionSetTagManagement - .create(entityFactory.tag().create().name("DsTag")); - return distributionSetTagManagement.update(entityFactory.tag().update(updateTag.getId()) - .description("My name is " + updateTag.getName()).colour("default")); - } - - private Long createDistributionSetTagId() { - return createDistributionSetTag().getId(); - } - -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetTypesDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetTypesDocumentationTest.java deleted file mode 100644 index d17f7a6739..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetTypesDocumentationTest.java +++ /dev/null @@ -1,448 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.mgmt.documentation; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.put; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; -import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; -import static org.springframework.restdocs.request.RequestDocumentation.requestParameters; -import static org.springframework.restdocs.snippet.Attributes.key; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.hawkbit.im.authentication.SpPermission; -import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; -import org.eclipse.hawkbit.repository.model.DistributionSetType; -import org.eclipse.hawkbit.repository.test.util.WithUser; -import org.eclipse.hawkbit.rest.documentation.AbstractApiRestDocumentation; -import org.eclipse.hawkbit.rest.documentation.ApiModelPropertiesGeneric; -import org.eclipse.hawkbit.rest.documentation.MgmtApiModelProperties; -import org.eclipse.hawkbit.rest.util.JsonBuilder; -import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; -import org.json.JSONObject; -import org.junit.jupiter.api.Test; -import org.springframework.http.MediaType; -import org.springframework.restdocs.payload.JsonFieldType; - -import io.qameta.allure.Description; -import io.qameta.allure.Feature; -import io.qameta.allure.Story; - -/** - * Documentation generation for Management API for {@link DistributionSetType}. - * - */ -@Feature("Spring Rest Docs Tests - DistributionSetType") -@Story("DistributionSetTypes Resource") -public class DistributionSetTypesDocumentationTest extends AbstractApiRestDocumentation { - - @Override - public String getResourceName() { - return "distributionsettypes"; - } - - @Test - @Description("Handles the GET request of retrieving all distribution set types within SP. Required Permission: READ_REPOSITORY.") - public void getDistributionSetTypes() throws Exception { - - distributionSetTypeManagement.update(entityFactory.distributionSetType() - .update(testdataFactory.createDistributionSet().getType().getId()).description("Desc1234")); - - mockMvc.perform( - get(MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING).accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andExpect(jsonPath("$.total", equalTo(4))) - .andDo(this.document.document(responseFields( - fieldWithPath("size").type(JsonFieldType.NUMBER).description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("content").description(MgmtApiModelProperties.TARGET_LIST), - fieldWithPath("content[].createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("content[].createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("content[].description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("content[].key").description(MgmtApiModelProperties.DS_TYPE_KEY), - fieldWithPath("content[].id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("content[].lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT).type("Number"), - fieldWithPath("content[].lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY).type("String"), - fieldWithPath("content[].name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("content[].deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("content[]._links.self").ignored()))); - } - - @Test - @Description("Handles the GET request of retrieving all distribution set types within SP with a defined page size and offset, sortet by name in descending order and filtered down to all targets which name starts with 'a'. Required Permission: READ_REPOSITORY.") - public void getDistributionSetTypesWithParameters() throws Exception { - - distributionSetTypeManagement.update( - entityFactory.distributionSetType().update(testdataFactory.createDistributionSet().getType().getId()) - .description("Desc1234").colour("rgb(86,37,99)")); - mockMvc.perform(get(MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING).accept(MediaType.APPLICATION_JSON) - .param("offset", "1").param("limit", "2").param("sort", "name:DESC").param("q", "name==a*")) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document(getFilterRequestParamter())); - } - - @Test - @WithUser(principal = "uploadTester", allSpPermissions = true) - @Description("Handles the POST request for creating new distribution set types within SP. The request body " - + "must always be a list of types. Required Permission: CREATE_REPOSITORY.") - public void postDistributionSetTypes() throws Exception { - - assertThat(distributionSetTypeManagement.count()).isEqualTo(4); - - final List types = new ArrayList<>(); - types.add(entityFactory.distributionSetType().create().key("test1").name("TestName1").description("Desc1") - .colour("rgb(86,37,99)").mandatory(osType).optional(runtimeType).build()); - - mockMvc.perform(post(MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING) - .content(JsonBuilder.distributionSetTypesCreateValidFieldsOnly(types)) - .contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isCreated()).andDo( - this.document.document( - requestFields( - requestFieldWithPath("[]key").description(MgmtApiModelProperties.DS_TYPE_KEY), - requestFieldWithPath("[]name").description(ApiModelPropertiesGeneric.NAME), - optionalRequestFieldWithPath("[]description") - .description(ApiModelPropertiesGeneric.DESCRPTION), - optionalRequestFieldWithPath("[]colour") - .description(ApiModelPropertiesGeneric.COLOUR), - optionalRequestFieldWithPath("[]mandatorymodules") - .description(MgmtApiModelProperties.DS_TYPE_MANDATORY_MODULES), - optionalRequestFieldWithPath("[]optionalmodules") - .description(MgmtApiModelProperties.DS_TYPE_OPTIONAL_MODULES)), - responseFields( - fieldWithPath("[]createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("[]createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("[]description") - .description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("[]key").description(MgmtApiModelProperties.DS_TYPE_KEY), - fieldWithPath("[]id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("[]lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT).type("Number"), - fieldWithPath("[]lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY).type("String"), - fieldWithPath("[]name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("[]deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("[]colour") - .description(ApiModelPropertiesGeneric.COLOUR), - fieldWithPath("[]_links.self").ignored()))); - } - - @Test - @Description("Handles the GET request of retrieving a single distribution set type within SP. Required Permission: READ_REPOSITORY") - public void deleteDistributionSetType() throws Exception { - final DistributionSetType testType = distributionSetTypeManagement.update( - entityFactory.distributionSetType().update(testdataFactory.createDistributionSet().getType().getId()) - .description("Desc1234").colour("rgb(86,37,99)")); - - mockMvc.perform(delete(MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}", - testType.getId())).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document(pathParameters( - parameterWithName("distributionSetTypeId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the DELETE request for a single distribution set type within SP. Required Permission: DELETE_REPOSITORY.") - public void getDistributionSetType() throws Exception { - - final DistributionSetType testType = distributionSetTypeManagement.update(entityFactory.distributionSetType() - .update(testdataFactory.createDistributionSet().getType().getId()).description("Desc1234").colour("rgb(86,37,99)")); - - mockMvc.perform(get(MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}", - testType.getId()).accept(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()) - .andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("distributionSetTypeId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("key").description(MgmtApiModelProperties.DS_TYPE_KEY), - fieldWithPath("id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT) - .type("Number"), - fieldWithPath("lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY) - .type("String"), - fieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("colour").description(ApiModelPropertiesGeneric.COLOUR), - fieldWithPath("_links.self").ignored(), - fieldWithPath("_links.mandatorymodules") - .description(MgmtApiModelProperties.LINK_TO_MANDATORY_SMT), - fieldWithPath("_links.optionalmodules") - .description(MgmtApiModelProperties.LINK_TO_OPTIONAL_SMT)))); - } - - @Test - @Description("Handles the GET request of retrieving all distribution set types within SP based on parameter. Required Permission: READ_REPOSITORY.") - public void getDistributionSetTypesWithParameter() throws Exception { - - mockMvc.perform(get(MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING - + "?limit=10&sort=name:ASC&offset=0&q=name==a")).andExpect(status().isOk()) - .andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(requestParameters( - parameterWithName("limit").attributes(key("type").value("query")) - .description(ApiModelPropertiesGeneric.LIMIT), - parameterWithName("sort").description(ApiModelPropertiesGeneric.SORT), - parameterWithName("offset").description(ApiModelPropertiesGeneric.OFFSET), - parameterWithName("q").description(ApiModelPropertiesGeneric.FIQL)))); - } - - @Test - @Description("Handles the PUT request for a single distribution set type within SP. Required Permission: UPDATE_REPOSITORY.") - public void putDistributionSetType() throws Exception { - final DistributionSetType testType = distributionSetTypeManagement.update(entityFactory.distributionSetType() - .update(testdataFactory.createDistributionSet().getType().getId()).description("Desc1234")); - final String body = new JSONObject().put("description", "an updated description") - .put("colour", "rgb(106,178,83)").toString(); - - this.mockMvc - .perform(put(MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING + "/{distributionSetTypeId}", - testType.getId()).content(body).contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("distributionSetTypeId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields( - optionalRequestFieldWithPath("description").description(ApiModelPropertiesGeneric.DESCRPTION), - optionalRequestFieldWithPath("colour").description(ApiModelPropertiesGeneric.COLOUR)), - responseFields(fieldWithPath("createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("key").description(MgmtApiModelProperties.DS_TYPE_KEY), - fieldWithPath("id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT) - .type("Number"), - fieldWithPath("lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY) - .type("String"), - fieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("colour").description(ApiModelPropertiesGeneric.COLOUR), - fieldWithPath("_links.self").ignored(), - fieldWithPath("_links.mandatorymodules") - .description(MgmtApiModelProperties.LINK_TO_MANDATORY_SMT), - fieldWithPath("_links.optionalmodules") - .description(MgmtApiModelProperties.LINK_TO_OPTIONAL_SMT)))); - - } - - @Test - @WithUser(principal = "uploadTester", allSpPermissions = true) - @Description("Handles the GET request of retrieving the list of mandatory software module types in that distribution set type. Required Permission: READ_REPOSITORY.") - public void getMandatoryModules() throws Exception { - final DistributionSetType testType = distributionSetTypeManagement - .create(entityFactory.distributionSetType().create().key("test1").name("TestName1").description("Desc1") - .colour("rgb(86,37,99)").mandatory(osType).optional(runtimeType)); - - mockMvc.perform(get(MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING - + "/{distributionSetTypeId}/mandatorymoduletypes", testType.getId()).accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - - .andDo(this.document.document( - pathParameters(parameterWithName("distributionSetTypeId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("[]createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("[]createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("[]description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("[]key").description(MgmtApiModelProperties.SM_TYPE_KEY), - fieldWithPath("[]maxAssignments") - .description(MgmtApiModelProperties.SMT_MAX_ASSIGNMENTS), - fieldWithPath("[]id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("[]lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT).type("Number"), - fieldWithPath("[]lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY).type("String"), - fieldWithPath("[]name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("[]deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("[]_links.self").ignored()))); - - } - - @Test - @Description("Handles the POST request for adding a mandatory software module type to a distribution set type." - + "Note that a DS type cannot be changed after it has been used by a DS. Required Permission: " - + SpPermission.UPDATE_REPOSITORY + " and " + SpPermission.READ_REPOSITORY) - public void postMandatoryModule() throws Exception { - final DistributionSetType testType = distributionSetTypeManagement.create(entityFactory.distributionSetType() - .create().key("test1").name("TestName1").description("Desc1").colour("rgb(86,37,99)")); - - mockMvc.perform(post(MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING - + "/{distributionSetTypeId}/mandatorymoduletypes", testType.getId()) - .content("{\"id\":" + osType.getId() + "}").contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("distributionSetTypeId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields(requestFieldWithPath("id").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the GET request of retrieving the list of software module types in that distribution set. " - + "Note that a DS type cannot be changed after it has been used by a DS. Required permissions: " - + SpPermission.UPDATE_REPOSITORY + " and " + SpPermission.READ_REPOSITORY) - public void deleteMandatoryModule() throws Exception { - final DistributionSetType testType = distributionSetTypeManagement - .create(entityFactory.distributionSetType().create().key("test1").name("TestName1").description("Desc1") - .colour("rgb(86,37,99)").mandatory(osType).optional(runtimeType)); - mockMvc.perform(delete( - MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING - + "/{distributionSetTypeId}/mandatorymoduletypes/{softwareModuleTypeId}", - testType.getId(), osType.getId()).contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document(pathParameters( - parameterWithName("distributionSetTypeId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("softwareModuleTypeId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - - } - - @Test - @Description("Handles the GET request of retrieving the single mandatory software module type in that distribution set type. Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getMandatoryModule() throws Exception { - final DistributionSetType testType = distributionSetTypeManagement - .create(entityFactory.distributionSetType().create().key("test1").name("TestName1").description("Desc1") - .colour("rgb(86,37,99)").mandatory(osType).optional(runtimeType)); - - mockMvc.perform(get( - MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING - + "/{distributionSetTypeId}/mandatorymoduletypes/{softwareModuleTypeId}", - testType.getId(), osType.getId()).contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document(pathParameters( - parameterWithName("distributionSetTypeId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("softwareModuleTypeId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("key").description(MgmtApiModelProperties.SM_TYPE_KEY), - fieldWithPath("maxAssignments").description(MgmtApiModelProperties.SMT_MAX_ASSIGNMENTS), - fieldWithPath("id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT) - .type("Number"), - fieldWithPath("lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY) - .type("String"), - fieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("_links.self").ignored()))); - } - - @Test - @Description("Handles the GET request of retrieving the list of optional software module types in that distribution set type. Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getOptionalModules() throws Exception { - final DistributionSetType testType = distributionSetTypeManagement - .create(entityFactory.distributionSetType().create().key("test1").name("TestName1").description("Desc1") - .colour("rgb(86,37,99)").mandatory(osType).optional(runtimeType)); - mockMvc.perform(get(MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING - + "/{distributionSetTypeId}/optionalmoduletypes", testType.getId()).accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("distributionSetTypeId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("[]createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("[]createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("[]description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("[]colour").description(ApiModelPropertiesGeneric.COLOUR), - fieldWithPath("[]key").description(MgmtApiModelProperties.SM_TYPE_KEY), - fieldWithPath("[]maxAssignments") - .description(MgmtApiModelProperties.SMT_MAX_ASSIGNMENTS), - fieldWithPath("[]id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("[]lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT), - fieldWithPath("[]lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY), - fieldWithPath("[]name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("[]deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("[]_links.self").ignored()))); - } - - @Test - @Description("Handles the POST request for adding an optional software module type to a distribution set type." - + "Note that a DS type cannot be changed after it has been used by a DS. Required Permission: " - + SpPermission.UPDATE_REPOSITORY + " and " + SpPermission.READ_REPOSITORY) - public void postOptionalModule() throws Exception { - final DistributionSetType testType = distributionSetTypeManagement.create(entityFactory.distributionSetType() - .create().key("test1").name("TestName1").description("Desc1").colour("rgb(86,37,99)")); - mockMvc.perform(post(MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING - + "/{distributionSetTypeId}/optionalmoduletypes", testType.getId()) - .content("{\"id\":" + appType.getId() + "}").contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("distributionSetTypeId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields(requestFieldWithPath("id").description(ApiModelPropertiesGeneric.ITEM_ID)))); - - } - - @Test - @Description("Handles DELETE request for removing an optional module from the distribution set type." - + "Note that a DS type cannot be changed after it has been used by a DS. Required Permission: " - + SpPermission.UPDATE_REPOSITORY + " and " + SpPermission.READ_REPOSITORY) - public void deleteOptionalModule() throws Exception { - final DistributionSetType testType = distributionSetTypeManagement - .create(entityFactory.distributionSetType().create().key("test1").name("TestName1").description("Desc1") - .colour("rgb(86,37,99)").mandatory(osType).optional(runtimeType)); - mockMvc.perform(delete( - MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING - + "/{distributionSetTypeId}/optionalmoduletypes/{softwareModuleTypeId}", - testType.getId(), appType.getId()).contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document(pathParameters( - parameterWithName("distributionSetTypeId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("softwareModuleTypeId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the GET request of retrieving the single optional software module type in that distribution set type. Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getOptionalModule() throws Exception { - final DistributionSetType testType = distributionSetTypeManagement - .create(entityFactory.distributionSetType().create().key("test1").name("TestName1").description("Desc1") - .colour("rgb(86,37,99)").mandatory(osType).optional(appType)); - - mockMvc.perform(get( - MgmtRestConstants.DISTRIBUTIONSETTYPE_V1_REQUEST_MAPPING - + "/{distributionSetTypeId}/optionalmoduletypes/{softwareModuleTypeId}", - testType.getId(), appType.getId()).contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document(pathParameters( - parameterWithName("distributionSetTypeId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("softwareModuleTypeId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("key").description(MgmtApiModelProperties.SM_TYPE_KEY), - fieldWithPath("maxAssignments").description(MgmtApiModelProperties.SMT_MAX_ASSIGNMENTS), - fieldWithPath("id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT) - .type("Number"), - fieldWithPath("lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY) - .type("String"), - fieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("_links.self").ignored()))); - } - -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetsDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetsDocumentationTest.java deleted file mode 100644 index b34a1243ef..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/DistributionSetsDocumentationTest.java +++ /dev/null @@ -1,698 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.mgmt.documentation; - -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.put; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; -import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; -import static org.springframework.restdocs.request.RequestDocumentation.requestParameters; -import static org.springframework.restdocs.snippet.Attributes.key; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -import org.eclipse.hawkbit.im.authentication.SpPermission; -import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; -import org.eclipse.hawkbit.repository.model.Action; -import org.eclipse.hawkbit.repository.model.Action.Status; -import org.eclipse.hawkbit.repository.model.DistributionSet; -import org.eclipse.hawkbit.repository.model.SoftwareModule; -import org.eclipse.hawkbit.repository.model.Target; -import org.eclipse.hawkbit.rest.documentation.AbstractApiRestDocumentation; -import org.eclipse.hawkbit.rest.documentation.ApiModelPropertiesGeneric; -import org.eclipse.hawkbit.rest.documentation.MgmtApiModelProperties; -import org.eclipse.hawkbit.rest.util.JsonBuilder; -import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; -import org.json.JSONArray; -import org.json.JSONObject; -import org.junit.jupiter.api.Test; -import org.springframework.hateoas.MediaTypes; -import org.springframework.http.MediaType; -import org.springframework.restdocs.payload.JsonFieldType; - -import com.google.common.collect.Lists; - -import io.qameta.allure.Description; -import io.qameta.allure.Feature; -import io.qameta.allure.Story; - -/** - * Documentation generation for Management API for {@link DistributionSet}. - */ -@Feature("Spring Rest Docs Tests - DistributionSet") -@Story("DistributionSet Resource") -public class DistributionSetsDocumentationTest extends AbstractApiRestDocumentation { - - @Override - public String getResourceName() { - return "distributionsets"; - } - - @Test - @Description("Get Distribution Set. Handles the GET request of retrieving a single distribution set within SP. Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getDistributionSet() throws Exception { - final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); - - mockMvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}", set.getId()) - .accept(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - getResponseFieldsDistributionSet(false))); - } - - @Test - @Description("Get paged list of Distribution Sets. Required Permission: " + SpPermission.READ_REPOSITORY) - public void getDistributionSets() throws Exception { - testdataFactory.createUpdatedDistributionSet(); - - mockMvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING).accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document(responseFields( - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("size").type(JsonFieldType.NUMBER).description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("content").description(MgmtApiModelProperties.DS_LIST), - fieldWithPath("content[].id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("content[].name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("content[].description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("content[].createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("content[].createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("content[].lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY), - fieldWithPath("content[].lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT), - fieldWithPath("content[].type").description(MgmtApiModelProperties.DS_TYPE), - fieldWithPath("content[].typeName").description(MgmtApiModelProperties.DS_TYPE_NAME), - fieldWithPath("content[].requiredMigrationStep") - .description(MgmtApiModelProperties.DS_REQUIRED_STEP), - fieldWithPath("content[].complete").description(MgmtApiModelProperties.DS_COMPLETE), - fieldWithPath("content[].deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("content[].version").description(MgmtApiModelProperties.VERSION), - fieldWithPath("content[]._links.self").ignored()))); - } - - @Test - @Description("Get paged list of Distribution Sets with given page size and offset including sorting by name descending and filter down to all sets which name starts with 'testDs'. Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getDistributionSetsWithParameters() throws Exception { - - final List sets = testdataFactory.createDistributionSets("testDS", 3); - - sets.forEach(set -> distributionSetManagement - .update(entityFactory.distributionSet().update(set.getId()).description("updated description"))); - - mockMvc.perform( - get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING).param("offset", "1").param("limit", "2") - .param("sort", "version:DESC").param("q", "name==testDS*").accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document(getFilterRequestParamter())); - - } - - @Test - @Description("Handles the DELETE request for a single Distribution Set within SP. Required Permission: " - + SpPermission.DELETE_REPOSITORY) - public void deleteDistributionSet() throws Exception { - final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); - - this.mockMvc - .perform(delete(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}", - set.getId())) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Create Distribution Sets. Handles the POST request of creating new distribution sets within SP. The request body must always be a list of sets. Required Permission: " - + SpPermission.CREATE_REPOSITORY) - public void createDistributionSets() throws Exception { - - final SoftwareModule ah = testdataFactory.createSoftwareModuleApp(); - final SoftwareModule os = testdataFactory.createSoftwareModuleOs(); - - final DistributionSet one = testdataFactory.generateDistributionSet("one", "one", standardDsType, - Arrays.asList(os, ah)); - final DistributionSet two = testdataFactory.generateDistributionSet("two", "two", standardDsType, - Arrays.asList(os, ah)); - final DistributionSet three = testdataFactory.generateDistributionSet("three", "three", standardDsType, - Arrays.asList(os, ah), true); - - final List sets = Arrays.asList(one, two, three); - - this.mockMvc - .perform(post(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/") - .content(JsonBuilder.distributionSetsCreateValidFieldsOnly(sets)) - .contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isCreated()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - requestFields(requestFieldWithPath("[]name").description(ApiModelPropertiesGeneric.NAME), - requestFieldWithPath("[]description").description(ApiModelPropertiesGeneric.DESCRPTION), - requestFieldWithPath("[]version").description(MgmtApiModelProperties.VERSION), - optionalRequestFieldWithPath("[]requiredMigrationStep") - .description(MgmtApiModelProperties.DS_REQUIRED_STEP), - requestFieldWithPath("[]type").description(MgmtApiModelProperties.DS_TYPE), - optionalRequestFieldWithPath("[]modules").ignored()), - getResponseFieldsDistributionSet(true))); - } - - @Test - @Description("Handles the UPDATE request for a single Distribution Set within SP. Required Permission: " - + SpPermission.UPDATE_REPOSITORY) - public void updateDistributionSet() throws Exception { - final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); - - final DistributionSet update = entityFactory.distributionSet().create().name("another Name") - .version("another Version").description("a new description").requiredMigrationStep(true).build(); - - mockMvc.perform(put(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}", set.getId()) - .content(JsonBuilder.distributionSetUpdateValidFieldsOnly(update)) - .contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields(optionalRequestFieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - optionalRequestFieldWithPath("version").description(MgmtApiModelProperties.VERSION), - optionalRequestFieldWithPath("description") - .description(ApiModelPropertiesGeneric.DESCRPTION), - optionalRequestFieldWithPath("requiredMigrationStep") - .description(MgmtApiModelProperties.DS_REQUIRED_STEP)), - getResponseFieldsDistributionSet(false))); - } - - @Test - @Description("Handles the GET request for retrieving assigned targets of a single distribution set. Required Permission: " - + SpPermission.READ_REPOSITORY + " and " + SpPermission.READ_TARGET) - public void getAssignedTargets() throws Exception { - final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); - - final Target target = testdataFactory.createTarget(); - // assign knownTargetId to distribution set - assignDistributionSet(set.getId(), target.getControllerId()); - - mockMvc.perform( - get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/assignedTargets", - set.getId()).accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("content").description(MgmtApiModelProperties.TARGET_LIST) - .type("Array[Object]")))); - - } - - @Test - @Description("Handles the GET request for retrieving assigned target filter queries of a single distribution set. Required Permission: " - + SpPermission.READ_REPOSITORY + " and " + SpPermission.READ_TARGET) - public void getAutoAssignTargetFilterQueries() throws Exception { - final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); - targetFilterQueryManagement.create(entityFactory.targetFilterQuery().create().name("filter1").query("name==a") - .autoAssignDistributionSet(set)); - targetFilterQueryManagement.create(entityFactory.targetFilterQuery().create().name("filter2").query("name==b") - .autoAssignDistributionSet(set)); - - mockMvc.perform(get( - MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/autoAssignTargetFilters", - set.getId()).accept(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()) - .andExpect(status().isOk()).andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("content").description(MgmtApiModelProperties.TARGET_FILTER_QUERIES_LIST) - .type("Array[Object]")))); - - } - - @Test - @Description("Handles the GET request for retrieving assigned target filter queries of a single distribution set with a defined page size and offset, sorted by name in descending order and filtered down to all targets with a name that ends with '1'. Required Permission: " - + SpPermission.READ_REPOSITORY + " and " + SpPermission.READ_TARGET) - public void getAutoAssignTargetFilterQueriesWithParameters() throws Exception { - final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); - targetFilterQueryManagement.create(entityFactory.targetFilterQuery().create().name("filter1").query("name==a") - .autoAssignDistributionSet(set)); - - mockMvc.perform(get( - MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/" + set.getId() + "/autoAssignTargetFilters") - .param("offset", "1").param("limit", "2").param("sort", "name:DESC").param("q", "name==*1") - .accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document(requestParameters( - parameterWithName("limit").attributes(key("type").value("query")) - .description(ApiModelPropertiesGeneric.LIMIT), - parameterWithName("sort").description(ApiModelPropertiesGeneric.SORT), - parameterWithName("offset").description(ApiModelPropertiesGeneric.OFFSET), - parameterWithName("q").description(ApiModelPropertiesGeneric.FIQL)))); - - } - - @Test - @Description("Handles the GET request for retrieving assigned targets of a single distribution set with a defined page size and offset, sorted by name in descending order and filtered down to all targets which controllerID starts with 'target'. Required Permission: " - + SpPermission.READ_REPOSITORY + " and " + SpPermission.READ_TARGET) - public void getAssignedTargetsWithParameters() throws Exception { - final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); - - assignDistributionSet(set, testdataFactory.createTargets(5, "targetMisc", "Test targets for query")) - .getAssignedEntity(); - - mockMvc.perform( - get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/" + set.getId() + "/assignedTargets") - .param("offset", "1").param("limit", "2").param("sort", "name:DESC") - .param("q", "controllerId==target*").accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document(requestParameters( - parameterWithName("limit").attributes(key("type").value("query")) - .description(ApiModelPropertiesGeneric.LIMIT), - parameterWithName("sort").description(ApiModelPropertiesGeneric.SORT), - parameterWithName("offset").description(ApiModelPropertiesGeneric.OFFSET), - parameterWithName("q").description(ApiModelPropertiesGeneric.FIQL)))); - - } - - @Test - @Description("Handles the GET request for retrieving installed targets of a single distribution set with a defined page size and offset, sortet by name in descending order and filtered down to all targets which controllerID starts with 'target'. Required Permission: " - + SpPermission.READ_REPOSITORY + " and " + SpPermission.READ_TARGET) - public void getInstalledTargetsWithParameters() throws Exception { - final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); - - final List targets = assignDistributionSet(set, - testdataFactory.createTargets(5, "targetMisc", "Test targets for query")).getAssignedEntity().stream() - .map(Action::getTarget).collect(Collectors.toList()); - testdataFactory.sendUpdateActionStatusToTargets(targets, Status.FINISHED, "some message"); - - mockMvc.perform( - get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/" + set.getId() + "/installedTargets") - .param("offset", "1").param("limit", "2").param("sort", "name:DESC") - .param("q", "controllerId==target*").accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document(requestParameters( - parameterWithName("limit").attributes(key("type").value("query")) - .description(ApiModelPropertiesGeneric.LIMIT), - parameterWithName("sort").description(ApiModelPropertiesGeneric.SORT), - parameterWithName("offset").description(ApiModelPropertiesGeneric.OFFSET), - parameterWithName("q").description(ApiModelPropertiesGeneric.FIQL)))); - } - - @Test - @Description("Handles the GET request for retrieving installed targets of a single distribution set. Required Permission: " - + SpPermission.READ_REPOSITORY + " and " + SpPermission.READ_TARGET) - public void getInstalledTargets() throws Exception { - final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); - - final Target target = testdataFactory.createTarget(); - // assign knownTargetId to distribution set - assignDistributionSet(set.getId(), target.getControllerId()); - // make it in install state - testdataFactory.sendUpdateActionStatusToTargets(Arrays.asList(target), Status.FINISHED, "some message"); - - mockMvc.perform( - get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/installedTargets", - set.getId()).accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("content").description(MgmtApiModelProperties.TARGET_LIST) - .type("Array[Object]")))); - } - - @Test - @Description("Handles the POST request for assigning multiple targets to a distribution set.The request body must always be a list of target IDs." - + " Required Permission: " + SpPermission.READ_REPOSITORY + " and " + SpPermission.UPDATE_TARGET) - public void createAssignedTarget() throws Exception { - enableConfirmationFlow(); - - final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); - - // prepare targets - final long forceTime = System.currentTimeMillis(); - final String[] knownTargetIds = new String[] { "target1", "target2", "target3", "target4", "target5" }; - final JSONArray list = new JSONArray(); - for (final String targetId : knownTargetIds) { - targetManagement.create(entityFactory.target().create().controllerId(targetId)); - list.put(new JSONObject().put("id", targetId).put("type", "timeforced").put("forcetime", forceTime) - .put("maintenanceWindow", new JSONObject().put("schedule", getTestSchedule(100)) - .put("duration", getTestDuration(10)).put("timezone", getTestTimeZone()))); - } - - // assign already one target to DS - assignDistributionSet(set.getId(), knownTargetIds[0]); - - this.mockMvc - .perform(post( - MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/assignedTargets", - set.getId()).content(list.toString()).contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestParameters(parameterWithName("offline") - .description(MgmtApiModelProperties.OFFLINE_UPDATE).optional()), - requestFields(requestFieldWithPath("[].id").description(ApiModelPropertiesGeneric.ITEM_ID), - requestFieldWithPathMandatoryInMultiAssignMode("[].weight") - .description(MgmtApiModelProperties.ASSIGNMENT_WEIGHT) - .type(JsonFieldType.NUMBER).attributes(key("value").value("0 - 1000")), - optionalRequestFieldWithPath("[].forcetime") - .description(MgmtApiModelProperties.FORCETIME), - optionalRequestFieldWithPath("[].maintenanceWindow") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW), - optionalRequestFieldWithPath("[].maintenanceWindow.schedule") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_SCHEDULE), - optionalRequestFieldWithPath("[].maintenanceWindow.duration") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_DURATION), - optionalRequestFieldWithPath("[].maintenanceWindow.timezone") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_TIMEZONE), - optionalRequestFieldWithPath("[].type") - .description(MgmtApiModelProperties.ASSIGNMENT_TYPE).attributes( - key("value").value("['soft', 'forced','timeforced', 'downloadonly']")), - optionalRequestFieldWithPath("[].confirmationRequired") - .description(MgmtApiModelProperties.ACTION_CONFIRMATION_REQUIRED) - .type(JsonFieldType.BOOLEAN.toString())), - responseFields( - fieldWithPath("assigned").description(MgmtApiModelProperties.DS_NEW_ASSIGNED_TARGETS), - fieldWithPath("alreadyAssigned").type(JsonFieldType.NUMBER) - .description(MgmtApiModelProperties.DS_ALREADY_ASSIGNED_TARGETS), - fieldWithPath("assignedActions").type(JsonFieldType.ARRAY) - .description(MgmtApiModelProperties.DS_NEW_ASSIGNED_ACTIONS), - fieldWithPath("assignedActions.[].id").type(JsonFieldType.NUMBER) - .description(MgmtApiModelProperties.ACTION_ID), - fieldWithPath("assignedActions.[]._links.self").type(JsonFieldType.OBJECT) - .description(MgmtApiModelProperties.LINK_TO_ACTION), - fieldWithPath("total").type(JsonFieldType.NUMBER) - .description(MgmtApiModelProperties.DS_TOTAL_ASSIGNED_TARGETS)))); - } - - @Test - @Description("Handles the POST request for assigning multiple software modules to a distribution set. The request body must always be a list of software module IDs." - + " Required Permission: " + SpPermission.READ_REPOSITORY + " and " + SpPermission.UPDATE_REPOSITORY) - public void assignSoftwareModules() throws Exception { - // create DisSet - final DistributionSet disSet = testdataFactory.createDistributionSetWithNoSoftwareModules("Jupiter", "398,88"); - - // create Software Modules - final List smIDs = Arrays.asList(testdataFactory.createSoftwareModuleOs().getId(), - testdataFactory.createSoftwareModuleApp().getId()); - final JSONArray list = new JSONArray(); - for (final Long smID : smIDs) { - list.put(new JSONObject().put("id", Long.valueOf(smID))); - } - - // post assignment - mockMvc.perform(post(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/assignedSM", - disSet.getId()).contentType(MediaType.APPLICATION_JSON).content(list.toString())) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields(requestFieldWithPath("[]id").description(ApiModelPropertiesGeneric.ITEM_ID)))); - - } - - @Test - @Description("Delete a software module assignment." + " Required Permission: " + SpPermission.UPDATE_REPOSITORY) - public void deleteAssignSoftwareModules() throws Exception { - final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); - - mockMvc.perform(delete( - MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING - + "/{distributionSetId}/assignedSM/{softwareModuleId}", - set.getId(), set.findFirstModuleByType(osType).get().getId()).contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document(pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("softwareModuleId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the GET request of retrieving assigned software modules of a single distribution set within SP. Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getAssignedSoftwareModules() throws Exception { - final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); - - // post assignment - mockMvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/assignedSM", - set.getId()).accept(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()) - .andExpect(status().isOk()).andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("content").description(MgmtApiModelProperties.SM_LIST), - fieldWithPath("content[].id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("content[].name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("content[].description") - .description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("content[].vendor").description(MgmtApiModelProperties.VENDOR), - fieldWithPath("content[].createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("content[].createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("content[].lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY), - fieldWithPath("content[].lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT), - fieldWithPath("content[].type").description(MgmtApiModelProperties.SM_TYPE), - fieldWithPath("content[].version").description(MgmtApiModelProperties.VERSION), - fieldWithPath("content[]._links.self").ignored()))); - } - - @Test - @Description("Handles the GET request of retrieving assigned software modules of a single distribution set within SP with given page size and offset including sorting by version descending and filter down to all sets which name starts with 'one'. Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getAssignedSoftwareModulesWithParameters() throws Exception { - final DistributionSet set = testdataFactory.createUpdatedDistributionSet(); - - // post assignment - mockMvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/" + set.getId() + "/assignedSM") - .param("offset", "1").param("limit", "2").param("sort", "version:DESC").param("q", "name==one*") - .accept(MediaType.APPLICATION_JSON)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document(requestParameters( - parameterWithName("limit").attributes(key("type").value("query")) - .description(ApiModelPropertiesGeneric.LIMIT), - parameterWithName("sort").description(ApiModelPropertiesGeneric.SORT), - parameterWithName("offset").description(ApiModelPropertiesGeneric.OFFSET), - parameterWithName("q").description(ApiModelPropertiesGeneric.FIQL)))); - } - - @Test - @Description("Get a paged list of meta data for a distribution set with standard page size." - + " Required Permission: " + SpPermission.READ_REPOSITORY) - public void getMetadata() throws Exception { - final int totalMetadata = 4; - final String knownKeyPrefix = "knownKey"; - final String knownValuePrefix = "knownValue"; - final DistributionSet testDS = testdataFactory.createDistributionSet("one"); - for (int index = 0; index < totalMetadata; index++) { - distributionSetManagement.createMetaData(testDS.getId(), Lists - .newArrayList(entityFactory.generateDsMetadata(knownKeyPrefix + index, knownValuePrefix + index))); - } - - mockMvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/metadata", - testDS.getId())).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("content").description(MgmtApiModelProperties.META_DATA), - fieldWithPath("content[].key").description(MgmtApiModelProperties.META_DATA_KEY), - fieldWithPath("content[].value").description(MgmtApiModelProperties.META_DATA_VALUE)))); - } - - @Test - @Description("Get a paged list of meta data for a distribution set with defined page size and sorting by name descending and key starting with 'known'." - + " Required Permission: " + SpPermission.READ_REPOSITORY) - public void getMetadataWithParameters() throws Exception { - final int totalMetadata = 4; - - final String knownKeyPrefix = "knownKey"; - final String knownValuePrefix = "knownValue"; - final DistributionSet testDS = testdataFactory.createDistributionSet("one"); - for (int index = 0; index < totalMetadata; index++) { - distributionSetManagement.createMetaData(testDS.getId(), Lists - .newArrayList(entityFactory.generateDsMetadata(knownKeyPrefix + index, knownValuePrefix + index))); - } - - mockMvc.perform(get(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{dsId}/metadata", testDS.getId()) - .param("offset", "1").param("limit", "2").param("sort", "key:DESC").param("q", "key==known*")) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - requestParameters( - parameterWithName("limit").attributes(key("type").value("query")) - .description(ApiModelPropertiesGeneric.LIMIT), - parameterWithName("sort").description(ApiModelPropertiesGeneric.SORT), - parameterWithName("offset").description(ApiModelPropertiesGeneric.OFFSET), - parameterWithName("q").description(ApiModelPropertiesGeneric.FIQL)), - responseFields(fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("content").description(MgmtApiModelProperties.META_DATA), - fieldWithPath("content[].key").description(MgmtApiModelProperties.META_DATA_KEY), - fieldWithPath("content[].value").description(MgmtApiModelProperties.META_DATA_VALUE)))); - } - - @Test - @Description("Get a single meta data value for a meta data key." + " Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getMetadataValue() throws Exception { - - // prepare and create metadata - final String knownKey = "knownKey"; - final String knownValue = "knownValue"; - final DistributionSet testDS = testdataFactory.createDistributionSet("one"); - distributionSetManagement.createMetaData(testDS.getId(), - Arrays.asList(entityFactory.generateDsMetadata(knownKey, knownValue))); - - mockMvc.perform(get( - MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/metadata/{metadatakey}", - testDS.getId(), knownKey)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("metadatakey").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("key").description(MgmtApiModelProperties.META_DATA_KEY), - fieldWithPath("value").description(MgmtApiModelProperties.META_DATA_VALUE)))); - } - - @Test - @Description("Update a single meta data value for specific key." + " Required Permission: " - + SpPermission.UPDATE_REPOSITORY) - public void updateMetadata() throws Exception { - // prepare and create metadata for update - final String knownKey = "knownKey"; - final String knownValue = "knownValue"; - final String updateValue = "valueForUpdate"; - - final DistributionSet testDS = testdataFactory.createDistributionSet("one"); - distributionSetManagement.createMetaData(testDS.getId(), - Arrays.asList(entityFactory.generateDsMetadata(knownKey, knownValue))); - - final JSONObject jsonObject = new JSONObject().put("key", knownKey).put("value", updateValue); - - mockMvc.perform(put( - MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/metadata/{metadatakey}", - testDS.getId(), knownKey).contentType(MediaType.APPLICATION_JSON).content(jsonObject.toString())) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("metadatakey").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields(requestFieldWithPath("key").description(MgmtApiModelProperties.META_DATA_KEY), - requestFieldWithPath("value").description(MgmtApiModelProperties.META_DATA_VALUE)), - responseFields(fieldWithPath("key").description(MgmtApiModelProperties.META_DATA_KEY), - fieldWithPath("value").description(MgmtApiModelProperties.META_DATA_VALUE)))); - - } - - @Test - @Description("Delete a single meta data." + " Required Permission: " + SpPermission.UPDATE_REPOSITORY) - public void deleteMetadata() throws Exception { - // prepare and create metadata for deletion - final String knownKey = "knownKey"; - final String knownValue = "knownValue"; - - final DistributionSet testDS = testdataFactory.createDistributionSet("one"); - distributionSetManagement.createMetaData(testDS.getId(), - Arrays.asList(entityFactory.generateDsMetadata(knownKey, knownValue))); - - mockMvc.perform( - delete(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/metadata/{key}", - testDS.getId(), knownKey)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document(pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("key").description(ApiModelPropertiesGeneric.ITEM_ID)))); - - } - - @Test - @Description("Create a list of meta data entries" + " Required Permission: " + SpPermission.READ_REPOSITORY - + " and " + SpPermission.UPDATE_TARGET) - public void createMetadata() throws Exception { - - final DistributionSet testDS = testdataFactory.createDistributionSet("one"); - - final String knownKey1 = "knownKey1"; - final String knownKey2 = "knownKey2"; - - final String knownValue1 = "knownValue1"; - final String knownValue2 = "knownValue2"; - - final JSONArray jsonArray = new JSONArray(); - jsonArray.put(new JSONObject().put("key", knownKey1).put("value", knownValue1)); - jsonArray.put(new JSONObject().put("key", knownKey2).put("value", knownValue2)); - - mockMvc.perform(post(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/metadata", - testDS.getId()).contentType(MediaType.APPLICATION_JSON).content(jsonArray.toString())) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isCreated()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("distributionSetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields(requestFieldWithPath("[]key").description(MgmtApiModelProperties.META_DATA_KEY), - optionalRequestFieldWithPath("[]value") - .description(MgmtApiModelProperties.META_DATA_VALUE)))); - } - - @Test - @Description("Invalidates a distribution set. Required Permission: " + SpPermission.UPDATE_REPOSITORY) - public void invalidate() throws Exception { - final DistributionSet testDS = testdataFactory.createDistributionSet(); - - final JSONObject jsonObject = new JSONObject(); - jsonObject.put("actionCancelationType", "soft"); - jsonObject.put("cancelRollouts", true); - - mockMvc.perform(post(MgmtRestConstants.DISTRIBUTIONSET_V1_REQUEST_MAPPING + "/{distributionSetId}/invalidate", - testDS.getId()).content(jsonObject.toString()).contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()).andDo( - this.document.document( - pathParameters(parameterWithName("distributionSetId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields( - requestFieldWithPath("actionCancelationType") - .description( - MgmtApiModelProperties.DS_INVALIDATION_ACTION_CANCELATION_TYPE) - .attributes(key("value").value("['force','soft','none']")), - optionalRequestFieldWithPath("cancelRollouts") - .description(MgmtApiModelProperties.DS_INVALIDATION_CANCEL_ROLLOUTS)))); - } -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/RolloutResourceDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/RolloutResourceDocumentationTest.java deleted file mode 100644 index 6ab7449dae..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/RolloutResourceDocumentationTest.java +++ /dev/null @@ -1,712 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.mgmt.documentation; - -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; -import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; -import static org.springframework.restdocs.snippet.Attributes.key; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.eclipse.hawkbit.im.authentication.SpPermission; -import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; -import org.eclipse.hawkbit.repository.builder.RolloutCreate; -import org.eclipse.hawkbit.repository.model.Rollout; -import org.eclipse.hawkbit.repository.model.RolloutGroup; -import org.eclipse.hawkbit.repository.model.RolloutGroup.RolloutGroupErrorAction; -import org.eclipse.hawkbit.repository.model.RolloutGroup.RolloutGroupErrorCondition; -import org.eclipse.hawkbit.repository.model.RolloutGroup.RolloutGroupSuccessAction; -import org.eclipse.hawkbit.repository.model.RolloutGroup.RolloutGroupSuccessCondition; -import org.eclipse.hawkbit.repository.model.RolloutGroupConditionBuilder; -import org.eclipse.hawkbit.repository.model.RolloutGroupConditions; -import org.eclipse.hawkbit.repository.test.util.RolloutTestApprovalStrategy; -import org.eclipse.hawkbit.rest.documentation.AbstractApiRestDocumentation; -import org.eclipse.hawkbit.rest.documentation.ApiModelPropertiesGeneric; -import org.eclipse.hawkbit.rest.documentation.DocumenationResponseFieldsSnippet; -import org.eclipse.hawkbit.rest.documentation.MgmtApiModelProperties; -import org.eclipse.hawkbit.rest.util.JsonBuilder; -import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.PageRequest; -import org.springframework.hateoas.MediaTypes; -import org.springframework.http.MediaType; -import org.springframework.restdocs.payload.FieldDescriptor; -import org.springframework.restdocs.payload.JsonFieldType; -import org.springframework.restdocs.snippet.Snippet; - -import io.qameta.allure.Description; -import io.qameta.allure.Feature; -import io.qameta.allure.Story; - -/** - * Documentation generation for Rollout API for {@link Rollout}. - * - */ -@Feature("Spring Rest Docs Tests - Rollout") -@Story("Rollout Resource") -public class RolloutResourceDocumentationTest extends AbstractApiRestDocumentation { - - @Autowired - private RolloutTestApprovalStrategy approvalStrategy; - - @Override - public String getResourceName() { - return "rollouts"; - } - - @BeforeEach - public void setUp() { - arrayPrefix = "content[]."; - approvalStrategy.setApprovalNeeded(false); - } - - @Test - @Description("Handles the GET request of retrieving all rollouts. Required Permission: " - + SpPermission.READ_ROLLOUT) - public void getRollouts() throws Exception { - enableMultiAssignments(); - createRolloutEntity(); - - mockMvc.perform(get(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document(getRolloutResponseFields(true, false, false, - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("size").type(JsonFieldType.NUMBER).description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("content").description(MgmtApiModelProperties.ROLLOUT_LIST)))); - } - - @Test - @Description("Handles the GET request of retrieving all rollouts. Required Permission: " - + SpPermission.READ_ROLLOUT) - public void getRolloutsWithParameters() throws Exception { - createRolloutEntity(); - - mockMvc.perform(get(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING).param("offset", "0").param("limit", "2") - .param("sort", "id:DESC").param("q", "name==exampleRollout*").accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document(getFilterRequestParamter())); - } - - private Snippet getRolloutResponseFields(final boolean isArray, final boolean withDetails, final boolean isApproveRequired, - final FieldDescriptor... descriptors) { - final String arrayPrefix = getArrayPrefix(isArray); - final List allFieldDescriptor = new ArrayList<>(); - allFieldDescriptor.addAll(Arrays.asList(descriptors)); - - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "id").description(ApiModelPropertiesGeneric.ITEM_ID)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "name").description(ApiModelPropertiesGeneric.NAME)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "weight") - .description(MgmtApiModelProperties.RESULTING_ACTIONS_WEIGHT).type(JsonFieldType.NUMBER).optional()); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "deleted").description(ApiModelPropertiesGeneric.DELETED)); - allFieldDescriptor - .add(fieldWithPath(arrayPrefix + "description").description(ApiModelPropertiesGeneric.DESCRPTION)); - allFieldDescriptor - .add(fieldWithPath(arrayPrefix + "createdBy").description(ApiModelPropertiesGeneric.CREATED_BY)); - allFieldDescriptor - .add(fieldWithPath(arrayPrefix + "createdAt").description(ApiModelPropertiesGeneric.CREATED_AT)); - allFieldDescriptor.add( - fieldWithPath(arrayPrefix + "lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY)); - allFieldDescriptor.add( - fieldWithPath(arrayPrefix + "lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "targetFilterQuery") - .description(MgmtApiModelProperties.ROLLOUT_FILTER_QUERY)); - allFieldDescriptor.add( - fieldWithPath(arrayPrefix + "distributionSetId").description(MgmtApiModelProperties.ROLLOUT_DS_ID)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "status").description(MgmtApiModelProperties.ROLLOUT_STATUS) - .attributes(key("value").value("['creating','ready','paused','running','finished']"))); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "type").description(MgmtApiModelProperties.ROLLOUT_TYPE) - .attributes(key("value").value("['forced','soft','timeforced','downloadonly']"))); - allFieldDescriptor.add( - fieldWithPath(arrayPrefix + "totalTargets").description(MgmtApiModelProperties.ROLLOUT_TOTAL_TARGETS)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "forcetime").description(MgmtApiModelProperties.FORCETIME)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "_links.self").ignored()); - if (withDetails) { - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "totalTargetsPerStatus") - .description(MgmtApiModelProperties.ROLLOUT_TOTAL_TARGETS_PER_STATUS)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "totalGroups") - .description(MgmtApiModelProperties.ROLLOUT_TOTAL_GROUPS)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "startAt") - .description(MgmtApiModelProperties.ROLLOUT_START_AT)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "_links.start") - .description(MgmtApiModelProperties.ROLLOUT_LINKS_START_SYNC)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "_links.pause") - .description(MgmtApiModelProperties.ROLLOUT_LINKS_PAUSE)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "_links.triggerNextGroup") - .description(MgmtApiModelProperties.ROLLOUT_LINKS_TRIGGER_NEXT_GROUP)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "_links.resume") - .description(MgmtApiModelProperties.ROLLOUT_LINKS_RESUME)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "_links.groups") - .description(MgmtApiModelProperties.ROLLOUT_LINKS_GROUPS)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "_links.approve") - .description(MgmtApiModelProperties.ROLLOUT_LINKS_APPROVE)); - allFieldDescriptor.add( - fieldWithPath(arrayPrefix + "_links.deny").description(MgmtApiModelProperties.ROLLOUT_LINKS_DENY)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "_links.distributionset") - .description(MgmtApiModelProperties.LINK_TO_DS)); - - if (isApproveRequired) { - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "approveDecidedBy") - .description("Who Approved/Denied the rollout. Not present if the rollout is missing approval.")); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "approvalRemark") - .description("A user remark of the approve/denied decision. Not present if the rollout is missing approval.")); - } - } - - return new DocumenationResponseFieldsSnippet(allFieldDescriptor); - } - - @Test - @Description("Handles the GET request of retrieving a single rollout. Required Permission: " - + SpPermission.READ_ROLLOUT) - public void getRollout() throws Exception { - enableMultiAssignments(); - approvalStrategy.setApprovalNeeded(true); - approvalStrategy.setApproveDecidedBy("exampleUsername"); - final Rollout rollout = createRolloutEntity(); - - rolloutManagement.approveOrDeny(rollout.getId(), Rollout.ApprovalDecision.APPROVED, "Approved remark."); - - mockMvc.perform(get(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}", rollout.getId()) - .accept(MediaTypes.HAL_JSON_VALUE)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document(getRolloutResponseFields(false, true, true), - pathParameters(parameterWithName("rolloutId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the POST request of creating a rollout. Required Permission: " + SpPermission.CREATE_ROLLOUT) - public void createRollout() throws Exception { - enableConfirmationFlow(); - - testdataFactory.createTargets(20, "targets-"); - - final String name = "exampleRollout"; - final String type = "forced"; - final String description = "Rollout for all named targets"; - final int groupSize = 5; - final Long dsId = testdataFactory.createDistributionSet().getId(); - final String targetFilter = "id==targets-*"; - - final RolloutGroupConditions rolloutGroupConditions = new RolloutGroupConditionBuilder() - .successCondition(RolloutGroupSuccessCondition.THRESHOLD, "50") - .successAction(RolloutGroupSuccessAction.NEXTGROUP, "") - .errorCondition(RolloutGroupErrorCondition.THRESHOLD, "80") - .errorAction(RolloutGroupErrorAction.PAUSE, "").build(); - - mockMvc.perform( - post(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING) - .content(JsonBuilder.rollout(name, description, groupSize, dsId, targetFilter, rolloutGroupConditions, null, type, - null, System.currentTimeMillis() + 2000, System.currentTimeMillis() + 3000, false)) - .contentType(MediaTypes.HAL_JSON).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isCreated()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document(requestFields( - requestFieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - requestFieldWithPathMandatoryInMultiAssignMode("weight").type(JsonFieldType.NUMBER) - .description(MgmtApiModelProperties.RESULTING_ACTIONS_WEIGHT) - .attributes(key("value").value("0 - 1000")), - requestFieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - optionalRequestFieldWithPath("forcetime").description(MgmtApiModelProperties.FORCETIME), - optionalRequestFieldWithPath("type").description(MgmtApiModelProperties.ROLLOUT_TYPE) - .attributes(key("value").value("['soft', 'forced', 'timeforced', 'downloadonly']")), - optionalRequestFieldWithPath("startAt").description(MgmtApiModelProperties.ROLLOUT_START_AT) - .type(JsonFieldType.NUMBER), - optionalRequestFieldWithPath("confirmationRequired") - .description(MgmtApiModelProperties.ROLLOUT_CONFIRMATION_REQUIRED) - .type(JsonFieldType.BOOLEAN.toString()), - requestFieldWithPath("distributionSetId").description(MgmtApiModelProperties.ROLLOUT_DS_ID), - requestFieldWithPath("targetFilterQuery") - .description(MgmtApiModelProperties.ROLLOUT_FILTER_QUERY), - requestFieldWithPath("amountGroups").description(MgmtApiModelProperties.ROLLOUT_AMOUNT_GROUPS), - optionalRequestFieldWithPath("description").description(ApiModelPropertiesGeneric.DESCRPTION), - optionalRequestFieldWithPath("successCondition") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_CONDITION), - optionalRequestFieldWithPath("successCondition.condition") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_CONDITION_CONDITION) - .attributes(key("value").value("['threshold']")), - optionalRequestFieldWithPath("successCondition.expression") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_CONDITION_EXP), - optionalRequestFieldWithPath("successAction") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_ACTION), - optionalRequestFieldWithPath("successAction.action") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_ACTION_ACTION) - .attributes(key("value").value("['nextgroup']")), - optionalRequestFieldWithPath("successAction.expression") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_ACTION_EXP), - optionalRequestFieldWithPath("errorCondition") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_CONDITION), - optionalRequestFieldWithPath("errorCondition.condition") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_CONDITION_CONDITION) - .attributes(key("value").value("['threshold']")), - optionalRequestFieldWithPath("errorCondition.expression") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_CONDITION_EXP), - optionalRequestFieldWithPath("errorAction") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_ACTION), - optionalRequestFieldWithPath("errorAction.action") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_ACTION_ACTION) - .attributes(key("value").value("['pause']")), - optionalRequestFieldWithPath("errorAction.expression") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_ACTION_EXP)), - - getRolloutResponseFields(false, true, false))); - - } - - @Test - @Description("Handles the POST request of creating a rollout with a groups definition. Required Permission: " - + SpPermission.CREATE_ROLLOUT) - public void createRolloutWithGroupsDefinition() throws Exception { - enableConfirmationFlow(); - - final int amountTargets = 10; - testdataFactory.createTargets(amountTargets, "targets-", "rollout"); - - final List rolloutGroups = new ArrayList<>(2); - final float percentTargetsInGroup1 = 20; - final float percentTargetsInGroup2 = 100; - - final RolloutGroup group1 = entityFactory.rolloutGroup().create().name("Group1").description("Group1desc") - .targetFilterQuery("name==targets-1*").targetPercentage(percentTargetsInGroup1) - .conditions(new RolloutGroupConditionBuilder() - .successCondition(RolloutGroupSuccessCondition.THRESHOLD, "90") - .successAction(RolloutGroupSuccessAction.NEXTGROUP, "") - .errorCondition(RolloutGroupErrorCondition.THRESHOLD, "30") - .errorAction(RolloutGroupErrorAction.PAUSE, "").build()) - .build(); - rolloutGroups.add(group1); - - final RolloutGroup group2 = entityFactory.rolloutGroup().create().name("Group2").description("Group2desc") - .targetPercentage(percentTargetsInGroup2).build(); - rolloutGroups.add(group2); - - final String name = "exampleRolloutWithDefinedGroups"; - final String description = "Rollout for all named targets"; - final Long dsId = testdataFactory.createDistributionSet().getId(); - final String targetFilter = "id==targets-*"; - final RolloutGroupConditions rolloutGroupConditions = new RolloutGroupConditionBuilder() - .successCondition(RolloutGroupSuccessCondition.THRESHOLD, "50") - .successAction(RolloutGroupSuccessAction.NEXTGROUP, "") - .errorCondition(RolloutGroupErrorCondition.THRESHOLD, "80") - .errorAction(RolloutGroupErrorAction.PAUSE, "").build(); - mockMvc.perform(post(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING) - .content(JsonBuilder.rolloutWithGroups(name, description, null, dsId, targetFilter, - rolloutGroupConditions, rolloutGroups, null, null, true)) - .contentType( - MediaType.APPLICATION_JSON).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isCreated()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - requestFields(requestFieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - requestFieldWithPathMandatoryInMultiAssignMode("weight") - .type(JsonFieldType.NUMBER) - .description(MgmtApiModelProperties.RESULTING_ACTIONS_WEIGHT) - .attributes(key("value").value("0 - 1000")), - requestFieldWithPath("distributionSetId") - .description(MgmtApiModelProperties.ROLLOUT_DS_ID), - requestFieldWithPath("targetFilterQuery") - .description(MgmtApiModelProperties.ROLLOUT_FILTER_QUERY), - requestFieldWithPath("confirmationRequired") - .description(MgmtApiModelProperties.ROLLOUT_CONFIRMATION_REQUIRED), - optionalRequestFieldWithPath("description") - .description(ApiModelPropertiesGeneric.DESCRPTION), - optionalRequestFieldWithPath("startAt").description(MgmtApiModelProperties.ROLLOUT_START_AT) - .type(JsonFieldType.NUMBER), - optionalRequestFieldWithPath("successCondition") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_CONDITION), - optionalRequestFieldWithPath("successCondition.condition") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_CONDITION_CONDITION) - .attributes(key("value").value("['threshold']")), - optionalRequestFieldWithPath("successCondition.expression") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_CONDITION_EXP), - optionalRequestFieldWithPath("successAction") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_ACTION), - optionalRequestFieldWithPath("successAction.action") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_ACTION_ACTION) - .attributes(key("value").value("['nextgroup']")), - optionalRequestFieldWithPath("successAction.expression") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_ACTION_EXP), - optionalRequestFieldWithPath("errorCondition") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_CONDITION), - optionalRequestFieldWithPath("errorCondition.condition") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_CONDITION_CONDITION) - .attributes(key("value").value("['threshold']")), - optionalRequestFieldWithPath("errorCondition.expression") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_CONDITION_EXP), - optionalRequestFieldWithPath("errorAction") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_ACTION), - optionalRequestFieldWithPath("errorAction.action") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_ACTION_ACTION) - .attributes(key("value").value("['pause']")), - optionalRequestFieldWithPath("errorAction.expression") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_ACTION_EXP), - requestFieldWithPath("groups").description(MgmtApiModelProperties.ROLLOUT_GROUPS), - requestFieldWithPath("groups[].name").description(ApiModelPropertiesGeneric.NAME), - requestFieldWithPath("groups[].description") - .description(ApiModelPropertiesGeneric.DESCRPTION), - optionalRequestFieldWithPath("groups[].targetFilterQuery") - .description(MgmtApiModelProperties.ROLLOUT_GROUP_FILTER_QUERY), - optionalRequestFieldWithPath("groups[].confirmationRequired") - .description(MgmtApiModelProperties.ROLLOUT_GROUP_CONFIRMATION_REQUIRED), - optionalRequestFieldWithPath("groups[].targetPercentage") - .description(MgmtApiModelProperties.ROLLOUT_GROUP_TARGET_PERCENTAGE) - .attributes(key("value").value("0..100")), - optionalRequestFieldWithPath("groups[].successCondition") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_CONDITION), - optionalRequestFieldWithPath("groups[].successCondition.condition") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_CONDITION_CONDITION) - .attributes(key("value").value("['threshold']")), - optionalRequestFieldWithPath("groups[].successCondition.expression") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_CONDITION_EXP), - optionalRequestFieldWithPath("groups[].successAction") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_ACTION), - optionalRequestFieldWithPath("groups[].successAction.action") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_ACTION_ACTION) - .attributes(key("value").value("['nextgroup']")), - optionalRequestFieldWithPath("groups[].successAction.expression") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_ACTION_EXP), - optionalRequestFieldWithPath("groups[].errorCondition") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_CONDITION), - optionalRequestFieldWithPath("groups[].errorCondition.condition") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_CONDITION_CONDITION) - .attributes(key("value").value("['threshold']")), - optionalRequestFieldWithPath("groups[].errorCondition.expression") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_CONDITION_EXP), - optionalRequestFieldWithPath("groups[].errorAction") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_ACTION), - optionalRequestFieldWithPath("groups[].errorAction.action") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_ACTION_ACTION) - .attributes(key("value").value("['pause']")), - optionalRequestFieldWithPath("groups[].errorAction.expression") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_ACTION_EXP)), - getRolloutResponseFields(false, true, false))); - } - - @Test - @Description("Handles the DELETE request of deleting a rollout within SP. Required Permission: " - + SpPermission.DELETE_ROLLOUT) - public void deleteRollout() throws Exception { - final Rollout rollout = createRolloutEntity(); - this.mockMvc.perform(delete(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}", rollout.getId())) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()).andDo(this.document.document( - pathParameters(parameterWithName("rolloutId").description(ApiModelPropertiesGeneric.NAME)))); - } - - @Test - @Description("Handles the POST request of starting a rollout. Required Permission: " + SpPermission.HANDLE_ROLLOUT) - public void startRollout() throws Exception { - final Rollout rollout = createRolloutEntity(); - mockMvc.perform(post(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/start", rollout.getId()) - .accept(MediaTypes.HAL_JSON_VALUE)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("rolloutId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the POST request of pausing a rollout. Required Permission: " + SpPermission.HANDLE_ROLLOUT) - public void pauseRollout() throws Exception { - final Rollout rollout = createRolloutEntity(); - rolloutManagement.start(rollout.getId()); - - // Run here, because scheduler is disabled during tests - rolloutHandler.handleAll(); - - mockMvc.perform(post(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/pause", rollout.getId()) - .accept(MediaTypes.HAL_JSON_VALUE)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("rolloutId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the POST request of resuming a rollout. Required Permission: " + SpPermission.HANDLE_ROLLOUT) - public void resumeRollout() throws Exception { - final Rollout rollout = createRolloutEntity(); - rolloutManagement.start(rollout.getId()); - - // Run here, because scheduler is disabled during tests - rolloutHandler.handleAll(); - - rolloutManagement.pauseRollout(rollout.getId()); - mockMvc.perform(post(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/resume", rollout.getId()) - .accept(MediaTypes.HAL_JSON_VALUE)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("rolloutId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the POST request of approving a rollout. Required Permission: " - + SpPermission.APPROVE_ROLLOUT) - public void approveRollout() throws Exception { - approvalStrategy.setApprovalNeeded(true); - final Rollout rollout = createRolloutEntity(); - mockMvc.perform(post(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/approve", rollout.getId()) - .accept(MediaTypes.HAL_JSON_VALUE)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("rolloutId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the POST request of denying a rollout. Required Permission: " + SpPermission.APPROVE_ROLLOUT) - public void denyRollout() throws Exception { - approvalStrategy.setApprovalNeeded(true); - final Rollout rollout = createRolloutEntity(); - mockMvc.perform(post(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/deny", rollout.getId()) - .accept(MediaTypes.HAL_JSON_VALUE)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("rolloutId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the POST request of triggering the next group of a rollout. Required Permission: " - + SpPermission.UPDATE_ROLLOUT) - public void triggerNextGroup() throws Exception { - final Rollout rollout = createRolloutEntity(); - rolloutManagement.start(rollout.getId()); - - // Run here, because scheduler is disabled during tests - rolloutHandler.handleAll(); - - mockMvc.perform( - post(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/triggerNextGroup", rollout.getId()) - .accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()).andDo(this.document.document( - pathParameters(parameterWithName("rolloutId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the GET request of retrieving the deploy groups of a rollout. Required Permission: " - + SpPermission.READ_ROLLOUT) - public void getRolloutDeployGroups() throws Exception { - enableConfirmationFlow(); - - final Rollout rollout = createRolloutEntity(); - - mockMvc.perform(get(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/deploygroups", rollout.getId()) - .accept(MediaTypes.HAL_JSON_VALUE)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - getRolloutDeployGroupResponseFields(true, false, - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("content").description(MgmtApiModelProperties.ROLLOUT_LIST)), - pathParameters(parameterWithName("rolloutId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the GET request of retrieving a deploy group of a rollout. Required Permission: " - + SpPermission.READ_ROLLOUT) - public void getRolloutDeployGroup() throws Exception { - enableConfirmationFlow(); - - final Rollout rollout = createRolloutEntity(); - final RolloutGroup firstRolloutGroup = rolloutGroupManagement.findByRollout(PAGE, rollout.getId()).getContent() - .get(0); - - mockMvc.perform(get(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/deploygroups/{deployGroupId}", - rollout.getId(), firstRolloutGroup.getId()).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document(getRolloutDeployGroupResponseFields(false, true), - pathParameters(parameterWithName("rolloutId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("deployGroupId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - private Snippet getRolloutDeployGroupResponseFields(final boolean isArray, final boolean withDetails, - final FieldDescriptor... descriptors) { - final String arrayPrefix = getArrayPrefix(isArray); - final List allFieldDescriptor = new ArrayList<>(); - allFieldDescriptor.addAll(Arrays.asList(descriptors)); - - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "id").description(ApiModelPropertiesGeneric.ITEM_ID)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "name").description(ApiModelPropertiesGeneric.NAME)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "description").optional() - .description(ApiModelPropertiesGeneric.DESCRPTION)); - allFieldDescriptor - .add(fieldWithPath(arrayPrefix + "createdBy").description(ApiModelPropertiesGeneric.CREATED_BY)); - allFieldDescriptor - .add(fieldWithPath(arrayPrefix + "createdAt").description(ApiModelPropertiesGeneric.CREATED_AT)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "lastModifiedBy").optional().type(JsonFieldType.STRING) - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "lastModifiedAt").optional().type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT)); - allFieldDescriptor - .add(fieldWithPath(arrayPrefix + "status").description(MgmtApiModelProperties.ROLLOUT_GROUP_STATUS) - .attributes(key("value").value("['creating','ready','paused','running','finished']"))); - - allFieldDescriptor.add( - fieldWithPath(arrayPrefix + "totalTargets").description(MgmtApiModelProperties.ROLLOUT_TOTAL_TARGETS)); - - if (withDetails) { - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "totalTargetsPerStatus") - .description(MgmtApiModelProperties.ROLLOUT_TOTAL_TARGETS_PER_STATUS)); - } - - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "targetFilterQuery") - .description(MgmtApiModelProperties.ROLLOUT_GROUP_FILTER_QUERY)); - - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "targetPercentage") - .description(MgmtApiModelProperties.ROLLOUT_GROUP_TARGET_PERCENTAGE)); - - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "confirmationRequired") - .description(MgmtApiModelProperties.ROLLOUT_GROUP_CONFIRMATION_REQUIRED)); - - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "successCondition") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_CONDITION)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "successCondition.condition") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_CONDITION_CONDITION)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "successCondition.expression") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_CONDITION_EXP)); - - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "successAction") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_ACTION)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "successAction.action") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_ACTION_ACTION)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "successAction.expression") - .description(MgmtApiModelProperties.ROLLOUT_SUCCESS_ACTION_EXP)); - - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "errorCondition") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_CONDITION)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "errorCondition.condition") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_CONDITION_CONDITION)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "errorCondition.expression") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_CONDITION_EXP)); - - allFieldDescriptor.add( - fieldWithPath(arrayPrefix + "errorAction").description(MgmtApiModelProperties.ROLLOUT_ERROR_ACTION)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "errorAction.action") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_ACTION_ACTION)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "errorAction.expression") - .description(MgmtApiModelProperties.ROLLOUT_ERROR_ACTION_EXP)); - - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "_links.self").ignored()); - - return new DocumenationResponseFieldsSnippet(allFieldDescriptor); - } - - @Test - @Description("Handles the GET request of retrieving a deploy group of a rollout. Required Permission: " - + SpPermission.READ_ROLLOUT) - public void getRolloutDeployGroupWithParameters() throws Exception { - final Rollout rollout = createRolloutEntity(); - final RolloutGroup firstRolloutGroup = rolloutGroupManagement - .findByRollout(PageRequest.of(0, 1), rollout.getId()).getContent().get(0); - - mockMvc.perform(get(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/deploygroups/{deployGroupId}", - rollout.getId(), firstRolloutGroup.getId()).param("offset", "0").param("limit", "2") - .param("sort", "id:DESC").param("q", "id==" + firstRolloutGroup.getId()) - .accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("rolloutId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("deployGroupId").description(ApiModelPropertiesGeneric.ITEM_ID)), - getFilterRequestParamter())); - } - - @Test - @Description("Handles the GET request of retrieving a all targets of a specific deploy group of a rollout. Required Permissions: " - + SpPermission.READ_ROLLOUT + ", " + SpPermission.READ_TARGET) - public void getRolloutDeployGroupTargets() throws Exception { - final Rollout rollout = createRolloutEntity(); - final RolloutGroup firstRolloutGroup = rolloutGroupManagement - .findByRollout(PageRequest.of(0, 1), rollout.getId()).getContent().get(0); - - mockMvc.perform( - get(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/deploygroups/{deployGroupId}/targets", - rollout.getId(), firstRolloutGroup.getId()).accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("rolloutId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("deployGroupId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields( - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("content").description(MgmtApiModelProperties.TARGET_LIST), - fieldWithPath("content[].createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("content[].address").optional().type(String.class) - .description(MgmtApiModelProperties.ADDRESS), - fieldWithPath("content[].createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("content[].name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("content[].description").optional().type(String.class) - .description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("content[].controllerId").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("content[].updateStatus") - .description(MgmtApiModelProperties.UPDATE_STATUS).type("enum") - .attributes(key("value") - .value("['error', 'in_sync', 'pending', 'registered', 'unknown']")), - fieldWithPath("content[].securityToken") - .description(MgmtApiModelProperties.SECURITY_TOKEN), - fieldWithPath("content[].installedAt").optional().type(Long.class) - .description(MgmtApiModelProperties.INSTALLED_AT), - fieldWithPath("content[].lastModifiedAt").optional().type(Long.class) - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT).type("Number"), - fieldWithPath("content[].lastModifiedBy").optional().type(String.class) - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY).type("String"), - fieldWithPath("content[].ipAddress").optional().type(String.class) - .description(MgmtApiModelProperties.IP_ADDRESS).type("String"), - fieldWithPath("content[].lastControllerRequestAt").optional().type(Long.class) - .description(MgmtApiModelProperties.LAST_REQUEST_AT).type("Number"), - fieldWithPath("content[]._links.self").ignored()))); - } - - @Test - @Description("Handles the GET request of retrieving a all targets of a specific deploy group of a rollout. Required Permission: " - + SpPermission.READ_ROLLOUT + ", " + SpPermission.READ_TARGET) - public void getRolloutDeployGroupTargetsWithParameters() throws Exception { - final Rollout rollout = createRolloutEntity(); - final RolloutGroup firstRolloutGroup = rolloutGroupManagement - .findByRollout(PageRequest.of(0, 1), rollout.getId()).getContent().get(0); - - mockMvc.perform( - get(MgmtRestConstants.ROLLOUT_V1_REQUEST_MAPPING + "/{rolloutId}/deploygroups/{deployGroupId}/targets", - rollout.getId(), firstRolloutGroup.getId()).param("offset", "0").param("limit", "2") - .param("sort", "name:ASC").param("q", "controllerId==exampleTarget0") - .accept(MediaTypes.HAL_JSON_VALUE)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("rolloutId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("deployGroupId").description(ApiModelPropertiesGeneric.ITEM_ID)), - getFilterRequestParamter())); - } - - private Rollout createRolloutEntity() { - testdataFactory.createTargets(20, "exampleTarget"); - final RolloutCreate rolloutCreate = entityFactory.rollout().create().name("exampleRollout") - .targetFilterQuery("controllerId==exampleTarget*").set(testdataFactory.createDistributionSet()); - if (isMultiAssignmentsEnabled()) { - rolloutCreate.weight(400); - } - rolloutCreate.forcedTime(System.currentTimeMillis() + 12345); - final Rollout rollout = rolloutManagement.create(rolloutCreate, 5, false, new RolloutGroupConditionBuilder() - .withDefaults().successCondition(RolloutGroupSuccessCondition.THRESHOLD, "10").build()); - - // Run here, because Scheduler is disabled during tests - rolloutHandler.handleAll(); - - return rolloutManagement - .update(entityFactory.rollout().update(rollout.getId()).startAt(System.currentTimeMillis() + 1000).description("exampleDescription")); - } - -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/SoftwaremoduleTypesDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/SoftwaremoduleTypesDocumentationTest.java deleted file mode 100644 index ed1ca10921..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/SoftwaremoduleTypesDocumentationTest.java +++ /dev/null @@ -1,220 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.mgmt.documentation; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.put; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; -import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.util.Arrays; -import java.util.List; - -import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; -import org.eclipse.hawkbit.repository.model.SoftwareModuleType; -import org.eclipse.hawkbit.repository.test.util.WithUser; -import org.eclipse.hawkbit.rest.documentation.AbstractApiRestDocumentation; -import org.eclipse.hawkbit.rest.documentation.ApiModelPropertiesGeneric; -import org.eclipse.hawkbit.rest.documentation.MgmtApiModelProperties; -import org.eclipse.hawkbit.rest.util.JsonBuilder; -import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; -import org.json.JSONObject; -import org.junit.jupiter.api.Test; -import org.springframework.http.MediaType; -import org.springframework.restdocs.payload.JsonFieldType; - -import io.qameta.allure.Description; -import io.qameta.allure.Feature; -import io.qameta.allure.Story; - -/** - * Documentation generation for Management API for {@link SoftwareModuleType}. - */ -@Feature("Spring Rest Docs Tests - SoftwareModuleType") -@Story("Softwaremoduletypes Resource") -public class SoftwaremoduleTypesDocumentationTest extends AbstractApiRestDocumentation { - - @Override - public String getResourceName() { - return "softwaremoduletypes"; - } - - @Test - @WithUser(principal = "uploadTester", allSpPermissions = true) - @Description("Handles the GET request of retrieving all software module types within SP. Required Permission: READ_REPOSITORY.") - public void getSoftwareModuleTypes() throws Exception { - - final SoftwareModuleType testType = testdataFactory.findOrCreateSoftwareModuleType("test123"); - softwareModuleTypeManagement - .update(entityFactory.softwareModuleType().update(testType.getId()).description("Desc1234").colour("rgb(106,178,83)")); - - mockMvc.perform(get(MgmtRestConstants.SOFTWAREMODULETYPE_V1_REQUEST_MAPPING).accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document(responseFields( - fieldWithPath("size").type(JsonFieldType.NUMBER).description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("content").description(MgmtApiModelProperties.TARGET_LIST), - fieldWithPath("content[].createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("content[].createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("content[].description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("content[].id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("content[].lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT).type("Number"), - fieldWithPath("content[].lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY).type("String"), - fieldWithPath("content[].name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("content[].deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("content[]._links.self").ignored()))); - } - - @Test - @WithUser(principal = "uploadTester", allSpPermissions = true) - @Description("Handles the GET request of retrieving all software module types within SP with parametsrs. In this case the first 10 result in ascending order by name wher the name starts with 'a'. Required Permission: READ_REPOSITORY.") - public void getSoftwareModuleTypesWithParameters() throws Exception { - final SoftwareModuleType testType = testdataFactory.findOrCreateSoftwareModuleType("test123"); - softwareModuleTypeManagement - .update(entityFactory.softwareModuleType().update(testType.getId()).description("Desc1234").colour("rgb(106,178,83)")); - - mockMvc.perform(get( - MgmtRestConstants.SOFTWAREMODULETYPE_V1_REQUEST_MAPPING + "?limit=10&sort=name:ASC&offset=0&q=name==a") - .accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document(getFilterRequestParamter())); - } - - @Test - @WithUser(principal = "uploadTester", allSpPermissions = true) - @Description("Handles the POST request of creating new software module types within SP. The request body must " - + "always be a list of module types. Required Permission: CREATE_REPOSITORY.") - public void postSoftwareModuleTypes() throws Exception { - - final List types = Arrays.asList(entityFactory.softwareModuleType().create().key("test1") - .name("TestName1").description("Desc1").colour("rgb(106,178,83)").build()); - - this.mockMvc - .perform(post(MgmtRestConstants.SOFTWAREMODULETYPE_V1_REQUEST_MAPPING) - .content(JsonBuilder.softwareModuleTypesCreatableFieldsOnly(types)) - .contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - requestFields( - requestFieldWithPath("[]key").description(MgmtApiModelProperties.SMT_KEY), - requestFieldWithPath("[]name").description(ApiModelPropertiesGeneric.NAME), - requestFieldWithPath("[]maxAssignments").description(MgmtApiModelProperties.SM_MAX_ASSIGNMENTS), - optionalRequestFieldWithPath("[]description") - .description(ApiModelPropertiesGeneric.DESCRPTION), - optionalRequestFieldWithPath("[]colour").description(ApiModelPropertiesGeneric.COLOUR)), - responseFields(fieldWithPath("[]key").description(MgmtApiModelProperties.SMT_KEY), - fieldWithPath("[]maxAssignments") - .description(MgmtApiModelProperties.SMT_MAX_ASSIGNMENTS), - fieldWithPath("[]createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("[]createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("[]description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("[]colour").description(ApiModelPropertiesGeneric.COLOUR), - fieldWithPath("[]deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("[]id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("[]lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT).type("Number"), - fieldWithPath("[]lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY).type("String"), - fieldWithPath("[]name").description(ApiModelPropertiesGeneric.NAME), - - fieldWithPath("[]_links.self").ignored()))); - - } - - @Test - @WithUser(principal = "uploadTester", allSpPermissions = true) - @Description("Handles the DELETE request for a single software module Type within SP. Required Permission: DELETE_REPOSITORY.") - public void deleteSoftwareModuleType() throws Exception { - final SoftwareModuleType testType = softwareModuleTypeManagement.create( - entityFactory.softwareModuleType().create().key("test1").name("TestName1").description("Desc1").colour("rgb(106,178,83)")); - assertThat(softwareModuleTypeManagement.count()).isEqualTo(4); - this.mockMvc - .perform(delete(MgmtRestConstants.SOFTWAREMODULETYPE_V1_REQUEST_MAPPING + "/{softwareModuleTypeID}", - testType.getId())) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document(pathParameters( - parameterWithName("softwareModuleTypeID").description(ApiModelPropertiesGeneric.ITEM_ID)))); - assertThat(softwareModuleTypeManagement.count()).isEqualTo(3); - } - - @Test - @WithUser(principal = "uploadTester", allSpPermissions = true) - @Description("Handles the GET request of retrieving a single software module type within SP. Required Permission: READ_REPOSITORY.") - public void getSoftwareModuleType() throws Exception { - final SoftwareModuleType testType = testdataFactory.findOrCreateSoftwareModuleType("test123"); - softwareModuleTypeManagement - .update(entityFactory.softwareModuleType().update(testType.getId()).description("Desc1234").colour("rgb(106,178,83)")); - - this.mockMvc - .perform(get(MgmtRestConstants.SOFTWAREMODULETYPE_V1_REQUEST_MAPPING + "/{softwareModuleTypeID}", - testType.getId()).accept(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("softwareModuleTypeID") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("key").description(MgmtApiModelProperties.SMT_KEY), - fieldWithPath("maxAssignments").description(MgmtApiModelProperties.SMT_MAX_ASSIGNMENTS), - fieldWithPath("createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("colour").description(ApiModelPropertiesGeneric.COLOUR), - fieldWithPath("deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT) - .type("Number"), - fieldWithPath("lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY) - .type("String"), - fieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - - fieldWithPath("_links.self").ignored()))); - } - - @Test - @Description("Handles the PUT request for a single software module type within SP. Required Permission: UPDATE_REPOSITORY.") - public void putSoftwareModuleType() throws Exception { - final SoftwareModuleType testType = testdataFactory.findOrCreateSoftwareModuleType("test123"); - - final String body = new JSONObject().put("description", "a new description").put("colour", "rgb(86,37,99)").toString(); - - this.mockMvc - .perform(put(MgmtRestConstants.SOFTWAREMODULETYPE_V1_REQUEST_MAPPING + "/{softwareModuleTypeID}", - testType.getId()).content(body.toString()).contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("softwareModuleTypeID") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields( - optionalRequestFieldWithPath("description").description(ApiModelPropertiesGeneric.DESCRPTION), - optionalRequestFieldWithPath("colour").description(ApiModelPropertiesGeneric.COLOUR)), - responseFields(fieldWithPath("key").description(MgmtApiModelProperties.SMT_KEY), - fieldWithPath("maxAssignments").description(MgmtApiModelProperties.SMT_MAX_ASSIGNMENTS), - fieldWithPath("createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("colour").description(ApiModelPropertiesGeneric.COLOUR), - fieldWithPath("deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT) - .type("Number"), - fieldWithPath("lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY) - .type("String"), - fieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("_links.self").ignored()))); - - } - -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/SoftwaremodulesDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/SoftwaremodulesDocumentationTest.java deleted file mode 100644 index c625a48f64..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/SoftwaremodulesDocumentationTest.java +++ /dev/null @@ -1,637 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.mgmt.documentation; - -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.fileUpload; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.put; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; -import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; -import static org.springframework.restdocs.request.RequestDocumentation.requestParameters; -import static org.springframework.restdocs.snippet.Attributes.key; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.io.ByteArrayInputStream; -import java.util.Arrays; -import java.util.List; - -import org.apache.commons.lang3.RandomStringUtils; -import org.eclipse.hawkbit.im.authentication.SpPermission; -import org.eclipse.hawkbit.mgmt.rest.api.MgmtRepresentationMode; -import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; -import org.eclipse.hawkbit.repository.Constants; -import org.eclipse.hawkbit.repository.model.Artifact; -import org.eclipse.hawkbit.repository.model.ArtifactUpload; -import org.eclipse.hawkbit.repository.model.SoftwareModule; -import org.eclipse.hawkbit.rest.documentation.AbstractApiRestDocumentation; -import org.eclipse.hawkbit.rest.documentation.ApiModelPropertiesGeneric; -import org.eclipse.hawkbit.rest.documentation.MgmtApiModelProperties; -import org.eclipse.hawkbit.rest.util.JsonBuilder; -import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; -import org.json.JSONArray; -import org.json.JSONObject; -import org.junit.jupiter.api.Test; -import org.springframework.hateoas.MediaTypes; -import org.springframework.http.MediaType; -import org.springframework.mock.web.MockMultipartFile; -import org.springframework.restdocs.payload.JsonFieldType; - -import io.qameta.allure.Description; -import io.qameta.allure.Feature; -import io.qameta.allure.Story; - -/** - * Documentation generation for Management API for {@link SoftwareModule}. - */ -@Feature("Spring Rest Docs Tests - SoftwareModule") -@Story("Softwaremodule Resource") -public class SoftwaremodulesDocumentationTest extends AbstractApiRestDocumentation { - - @Override - public String getResourceName() { - return "softwaremodules"; - } - - @Test - @Description("Handles the GET request of retrieving all softwaremodules within SP. Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getSoftwareModules() throws Exception { - - final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); - softwareModuleManagement.update(entityFactory.softwareModule().update(sm.getId()).description("a description")); - - final SoftwareModule sm2 = testdataFactory.createSoftwareModuleApp(); - softwareModuleManagement - .update(entityFactory.softwareModule().update(sm2.getId()).description("a description")); - - mockMvc.perform(get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING)).andDo(MockMvcResultPrinter.print()) - .andExpect(status().isOk()).andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document(responseFields( - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("size").type(JsonFieldType.NUMBER).description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("content").description(MgmtApiModelProperties.SM_LIST), - fieldWithPath("content[].id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("content[].name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("content[].description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("content[].vendor").description(MgmtApiModelProperties.VENDOR), - fieldWithPath("content[].encrypted").description(MgmtApiModelProperties.ENCRYPTED), - fieldWithPath("content[].createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("content[].createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("content[].lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY), - fieldWithPath("content[].lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT), - fieldWithPath("content[].type").description(MgmtApiModelProperties.SM_TYPE), - fieldWithPath("content[].typeName").description(MgmtApiModelProperties.SM_TYPE_NAME), - fieldWithPath("content[].version").description(MgmtApiModelProperties.VERSION), - fieldWithPath("content[]._links.self").ignored()))); - } - - @Test - @Description("Handles the GET request of retrieving all softwaremodules within SP with given page size and offset including sorting by version descending and filter down to all sets which name starts with 'SM'. Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getSoftwareModulesWithParameters() throws Exception { - - final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); - softwareModuleManagement.update(entityFactory.softwareModule().update(sm.getId()).description("a description")); - - final SoftwareModule sm2 = testdataFactory.createSoftwareModuleApp(); - softwareModuleManagement - .update(entityFactory.softwareModule().update(sm2.getId()).description("a description")); - - mockMvc.perform(get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING).param("offset", "1") - .param("limit", "2").param("sort", "version:DESC").param("q", "name==SM*")) - - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document(getFilterRequestParamter())); - } - - @Test - @Description("Handles the POST request of creating new software modules within SP. The request body must always be a list of modules. Required Permission: " - + SpPermission.CREATE_REPOSITORY) - public void postSoftwareModules() throws Exception { - final SoftwareModule os = entityFactory.softwareModule().create().type(osType).name("name1").version("version1") - .description("description1").vendor("vendor1").build(); - final SoftwareModule ah = entityFactory.softwareModule().create().type(appType).name("name3") - .version("version1").description("description1").vendor("vendor1").build(); - - final List modules = Arrays.asList(os, ah); - - mockMvc.perform(post(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING) - .content(JsonBuilder.softwareModulesCreatableFieldsOnly(modules)).contentType(MediaTypes.HAL_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isCreated()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - requestFields(requestFieldWithPath("[]name").description(ApiModelPropertiesGeneric.NAME), - optionalRequestFieldWithPath("[]description") - .description(ApiModelPropertiesGeneric.DESCRPTION), - requestFieldWithPath("[]version").description(MgmtApiModelProperties.VERSION), - optionalRequestFieldWithPath("[]vendor").description(MgmtApiModelProperties.VENDOR), - requestFieldWithPath("[]type").description(MgmtApiModelProperties.SMT_TYPE)), - responseFields(fieldWithPath("[].id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("[].name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("[].description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("[].vendor").description(MgmtApiModelProperties.VENDOR), - fieldWithPath("[].encrypted").description(MgmtApiModelProperties.ENCRYPTED), - fieldWithPath("[].deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("[].createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("[].createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("[].lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY), - fieldWithPath("[].lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT), - fieldWithPath("[].type").description(MgmtApiModelProperties.SM_TYPE), - fieldWithPath("[].typeName").description(MgmtApiModelProperties.SM_TYPE_NAME), - fieldWithPath("[].version").description(MgmtApiModelProperties.VERSION), - fieldWithPath("[]._links.self").ignored()))); - } - - @Test - @Description("Handles the DELETE request for a single softwaremodule within SP. Required Permission: " - + SpPermission.DELETE_REPOSITORY) - public void deleteSoftwareModule() throws Exception { - final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); - - this.mockMvc - .perform( - delete(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}", sm.getId())) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(pathParameters( - parameterWithName("softwareModuleId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the GET request of retrieving a single softwaremodule within SP. Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getSoftwareModule() throws Exception { - final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); - softwareModuleManagement.update(entityFactory.softwareModule().update(sm.getId()).description("a description")); - - mockMvc.perform(get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}", sm.getId())) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("softwareModuleId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY), - fieldWithPath("lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT), - fieldWithPath("vendor").description(MgmtApiModelProperties.VENDOR), - fieldWithPath("encrypted").description(MgmtApiModelProperties.ENCRYPTED), - fieldWithPath("deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("type").description(MgmtApiModelProperties.SM_TYPE), - fieldWithPath("typeName").description(MgmtApiModelProperties.SM_TYPE_NAME), - fieldWithPath("version").description(MgmtApiModelProperties.VERSION), - fieldWithPath("_links.self").ignored(), - fieldWithPath("_links.type").description(MgmtApiModelProperties.SM_TYPE), - fieldWithPath("_links.artifacts").description(MgmtApiModelProperties.ARTIFACT_LIST), - fieldWithPath("_links.metadata").description(MgmtApiModelProperties.META_DATA)))); - } - - @Test - @Description("Handles the PUT request for a single softwaremodule within SP. Required Permission: " - + SpPermission.UPDATE_REPOSITORY) - public void putSoftwareModule() throws Exception { - final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); - softwareModuleManagement.update(entityFactory.softwareModule().update(sm.getId()).description("a description")); - - final SoftwareModule update = entityFactory.softwareModule().create().name("another name") - .vendor("another Vendor").description("a new description").type(Constants.SMT_DEFAULT_OS_KEY).build(); - - mockMvc.perform(put(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}", sm.getId()) - .content(JsonBuilder.softwareModuleUpdatableFieldsOnly(update)).contentType(MediaTypes.HAL_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("softwareModuleId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields(optionalRequestFieldWithPath("vendor").description(MgmtApiModelProperties.VENDOR), - optionalRequestFieldWithPath("description") - .description(ApiModelPropertiesGeneric.DESCRPTION)), - responseFields(fieldWithPath("id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY), - fieldWithPath("lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT), - fieldWithPath("type").description(MgmtApiModelProperties.SM_TYPE), - fieldWithPath("typeName").description(MgmtApiModelProperties.SM_TYPE_NAME), - fieldWithPath("version").description(MgmtApiModelProperties.VERSION), - fieldWithPath("vendor").description(MgmtApiModelProperties.VENDOR), - fieldWithPath("encrypted").description(MgmtApiModelProperties.ENCRYPTED), - fieldWithPath("deleted").description(ApiModelPropertiesGeneric.DELETED), - fieldWithPath("_links.self").ignored(), - fieldWithPath("_links.type").description(MgmtApiModelProperties.SM_TYPE), - fieldWithPath("_links.artifacts").description(MgmtApiModelProperties.ARTIFACT_LIST), - fieldWithPath("_links.metadata").description(MgmtApiModelProperties.META_DATA)))); - - } - - @Test - @Description("Handles the GET request of retrieving all meta data of artifacts assigned to a software module. Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getArtifacts() throws Exception { - final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); - - final byte[] random = RandomStringUtils.random(5).getBytes(); - - artifactManagement.create(new ArtifactUpload(new ByteArrayInputStream(random), sm.getId(), "file1", false, 0)); - - mockMvc.perform( - get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/artifacts", sm.getId())) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("softwareModuleId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("[].id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("[].size").description(MgmtApiModelProperties.ARTIFACT_SIZE), - fieldWithPath("[].createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("[].createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("[].lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY), - fieldWithPath("[].lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT), - fieldWithPath("[].hashes.md5").description(MgmtApiModelProperties.ARTIFACT_HASHES_MD5), - fieldWithPath("[].hashes.sha1") - .description(MgmtApiModelProperties.ARTIFACT_HASHES_SHA1), - fieldWithPath("[].hashes.sha256") - .description(MgmtApiModelProperties.ARTIFACT_HASHES_SHA256), - fieldWithPath("[].providedFilename") - .description(MgmtApiModelProperties.ARTIFACT_PROVIDED_FILENAME), - fieldWithPath("[]._links.self").ignored()))); - } - - @Test - @Description("Handles the GET request of retrieving all meta data of artifacts assigned to a software module (in full representation mode including a download URL by the artifact provider). Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getArtifactsWithParameters() throws Exception { - final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); - - final byte[] random = RandomStringUtils.random(5).getBytes(); - - artifactManagement.create(new ArtifactUpload(new ByteArrayInputStream(random), sm.getId(), "file1", false, 0)); - - mockMvc.perform( - get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/artifacts", sm.getId()) - .param("representation", MgmtRepresentationMode.FULL.toString()) - .param("useartifacturlhandler", Boolean.TRUE.toString())) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document(requestParameters( - parameterWithName("representation").description(MgmtApiModelProperties.REPRESENTATION_MODE) - .optional(), - parameterWithName("useartifacturlhandler") - .description(MgmtApiModelProperties.ARTIFACT_DOWNLOAD_USE_URL_HANDLER).optional()))); - } - - @Test - @Description("Handles POST request for artifact upload. Required Permission: " + SpPermission.CREATE_REPOSITORY) - public void postArtifact() throws Exception { - final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); - - // create test file - final byte[] random = RandomStringUtils.random(5).getBytes(); - final MockMultipartFile file = new MockMultipartFile("file", "origFilename", null, random); - - mockMvc.perform( - fileUpload(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/artifacts", - sm.getId()).file(file)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isCreated()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("softwareModuleId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("size").description(MgmtApiModelProperties.ARTIFACT_SIZE), - fieldWithPath("id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY), - fieldWithPath("lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT), - fieldWithPath("_links.self").ignored(), - fieldWithPath("_links.download") - .description(MgmtApiModelProperties.ARTIFACT_DOWNLOAD_LINK), - fieldWithPath("hashes.md5").description(MgmtApiModelProperties.ARTIFACT_HASHES_MD5), - fieldWithPath("hashes.sha1").description(MgmtApiModelProperties.ARTIFACT_HASHES_SHA1), - fieldWithPath("hashes.sha256") - .description(MgmtApiModelProperties.ARTIFACT_HASHES_SHA256), - fieldWithPath("providedFilename") - .description(MgmtApiModelProperties.ARTIFACT_PROVIDED_FILENAME))) - - ); - } - - @Test - @Description("Handles POST request for artifact upload. Required Permission: " + SpPermission.CREATE_REPOSITORY) - public void postArtifactWithParameters() throws Exception { - - final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); - - final byte[] random = RandomStringUtils.random(5).getBytes(); - final MockMultipartFile file = new MockMultipartFile("file", "origFilename", null, random); - - mockMvc.perform( - fileUpload(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/artifacts", - sm.getId()).file(file).param("filename", "filename").param("file", "s") - .param("md5sum", "md5sum").param("sha1sum", "sha1sum")) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isBadRequest()) - .andExpect(content().contentType(MediaType.APPLICATION_JSON)) - .andDo(this.document.document(requestParameters( - parameterWithName("filename").description(MgmtApiModelProperties.ARTIFACT_PROVIDED_FILENAME), - parameterWithName("file").description(MgmtApiModelProperties.ARTIFACT_PROVIDED_FILE), - parameterWithName("md5sum").description(MgmtApiModelProperties.ARTIFACT_HASHES_MD5), - parameterWithName("sha1sum").description(MgmtApiModelProperties.ARTIFACT_HASHES_SHA1)))); - } - - @Test - @Description("Handles the DELETE request for a single SoftwareModule within SP. Required Permission: " - + SpPermission.DELETE_REPOSITORY) - public void deleteArtifact() throws Exception { - final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); - - final byte[] random = RandomStringUtils.random(5).getBytes(); - - final Artifact artifact = artifactManagement - .create(new ArtifactUpload(new ByteArrayInputStream(random), sm.getId(), "file1", false, 0)); - - mockMvc.perform(delete( - MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/artifacts/{artifactId}", - sm.getId(), artifact.getId())).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document(pathParameters( - parameterWithName("softwareModuleId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("artifactId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the GET request of retrieving a single Artifact meta data request. Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getArtifact() throws Exception { - final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); - - final byte[] random = RandomStringUtils.random(5).getBytes(); - - final Artifact artifact = artifactManagement - .create(new ArtifactUpload(new ByteArrayInputStream(random), sm.getId(), "file1", false, 0)); - - mockMvc.perform( - get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/artifacts/{artifactId}", - sm.getId(), artifact.getId())) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("softwareModuleId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("artifactId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("size").description(MgmtApiModelProperties.ARTIFACT_SIZE), - fieldWithPath("createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY), - fieldWithPath("lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT), - fieldWithPath("hashes.md5").description(MgmtApiModelProperties.ARTIFACT_HASHES_MD5), - fieldWithPath("hashes.sha1").description(MgmtApiModelProperties.ARTIFACT_HASHES_SHA1), - fieldWithPath("hashes.sha256") - .description(MgmtApiModelProperties.ARTIFACT_HASHES_SHA256), - fieldWithPath("providedFilename") - .description(MgmtApiModelProperties.ARTIFACT_PROVIDED_FILENAME), - fieldWithPath("_links.self").ignored(), fieldWithPath("_links.download") - .description(MgmtApiModelProperties.ARTIFACT_DOWNLOAD_LINK)))); - } - - @Test - @Description("Handles the GET request of retrieving a single Artifact meta data request. Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getArtifactWithParameters() throws Exception { - final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); - - final byte[] random = RandomStringUtils.random(5).getBytes(); - - final Artifact artifact = artifactManagement - .create(new ArtifactUpload(new ByteArrayInputStream(random), sm.getId(), "file1", false, 0)); - - mockMvc.perform( - get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/artifacts/{artifactId}", - sm.getId(), artifact.getId()).param("useartifacturlhandler", "true")) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document(requestParameters(parameterWithName("useartifacturlhandler") - .description(MgmtApiModelProperties.ARTIFACT_DOWNLOAD_USE_URL_HANDLER).optional()))); - } - - @Test - @Description("Handles the GET request for downloading an artifact. Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getDownloadArtifact() throws Exception { - - final SoftwareModule sm = testdataFactory.createSoftwareModuleOs(); - - final byte[] random = RandomStringUtils.random(5).getBytes(); - - final Artifact artifact = artifactManagement - .create(new ArtifactUpload(new ByteArrayInputStream(random), sm.getId(), "file1", false, 0)); - - mockMvc.perform(get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING - + "/{softwareModuleId}/artifacts/{artifactId}/download", sm.getId(), artifact.getId()) - .accept(MediaType.APPLICATION_OCTET_STREAM)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaType.APPLICATION_OCTET_STREAM)) - .andDo(this.document.document(pathParameters( - parameterWithName("softwareModuleId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("artifactId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description(" Get a paged list of meta data for a software module." + " Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getMetadata() throws Exception { - final int totalMetadata = 4; - final String knownKeyPrefix = "knownKey"; - final String knownValuePrefix = "knownValue"; - final SoftwareModule module = testdataFactory.createDistributionSet("one").findFirstModuleByType(osType).get(); - - for (int index = 0; index < totalMetadata; index++) { - softwareModuleManagement.createMetaData(entityFactory.softwareModuleMetadata().create(module.getId()) - .key(knownKeyPrefix + index).value(knownValuePrefix + index)); - } - - mockMvc.perform(get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/metadata", - module.getId())).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("softwareModuleId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("content").description(MgmtApiModelProperties.META_DATA), - fieldWithPath("content[].key").description(MgmtApiModelProperties.META_DATA_KEY), - fieldWithPath("content[].value").description(MgmtApiModelProperties.META_DATA_VALUE), - fieldWithPath("content[].targetVisible") - .description(MgmtApiModelProperties.SM_META_DATA_TARGET_VISIBLE)))); - } - - @Test - @Description(" Get a paged list of meta data for a software module with defined page size and sorting by name descending and key starting with 'known'." - + " Required Permission: " + SpPermission.READ_REPOSITORY) - public void getMetadataWithParameters() throws Exception { - final int totalMetadata = 4; - final String knownKeyPrefix = "knownKey"; - final String knownValuePrefix = "knownValue"; - final SoftwareModule module = testdataFactory.createDistributionSet("one").findFirstModuleByType(osType).get(); - - for (int index = 0; index < totalMetadata; index++) { - softwareModuleManagement.createMetaData(entityFactory.softwareModuleMetadata().create(module.getId()) - .key(knownKeyPrefix + index).value(knownValuePrefix + index)); - } - - mockMvc.perform(get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/metadata", - module.getId()).param("offset", "1").param("limit", "2").param("sort", "key:DESC").param("q", - "key==known*")) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("softwareModuleId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestParameters( - parameterWithName("limit").attributes(key("type").value("query")) - .description(ApiModelPropertiesGeneric.LIMIT), - parameterWithName("sort").description(ApiModelPropertiesGeneric.SORT), - parameterWithName("offset").description(ApiModelPropertiesGeneric.OFFSET), - parameterWithName("q").description(ApiModelPropertiesGeneric.FIQL)))); - } - - @Test - @Description("Create a list of meta data entries" + " Required Permission: " + SpPermission.UPDATE_REPOSITORY) - public void postMetadata() throws Exception { - - final SoftwareModule module = testdataFactory.createDistributionSet("one").findFirstModuleByType(osType).get(); - - final String knownKey1 = "knownKey1"; - final String knownKey2 = "knownKey2"; - - final String knownValue1 = "knownValue1"; - final String knownValue2 = "knownValue2"; - - final JSONArray jsonArray = new JSONArray(); - jsonArray.put(new JSONObject().put("key", knownKey1).put("value", knownValue1)); - jsonArray.put(new JSONObject().put("key", knownKey2).put("value", knownValue2).put("targetVisible", true)); - - mockMvc.perform(post(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/metadata", - module.getId()).contentType(MediaTypes.HAL_JSON).content(jsonArray.toString())) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isCreated()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters( - parameterWithName("softwareModuleId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields(requestFieldWithPath("[]key").description(MgmtApiModelProperties.META_DATA_KEY), - requestFieldWithPath("[]value").description(MgmtApiModelProperties.META_DATA_VALUE), - requestFieldWithPath("[]targetVisible") - .description(MgmtApiModelProperties.SM_META_DATA_TARGET_VISIBLE).optional()), - - responseFields(fieldWithPath("[]key").description(MgmtApiModelProperties.META_DATA_KEY), - fieldWithPath("[]value").description(MgmtApiModelProperties.META_DATA_VALUE), - fieldWithPath("[]targetVisible") - .description(MgmtApiModelProperties.SM_META_DATA_TARGET_VISIBLE) - - ) - - )); - } - - @Test - @Description(" Delete a single meta data." + " Required Permission: " + SpPermission.UPDATE_REPOSITORY) - public void deleteMetadata() throws Exception { - // prepare and create metadata for deletion - final String knownKey = "knownKey"; - final String knownValue = "knownValue"; - - final SoftwareModule module = testdataFactory.createDistributionSet("one").findFirstModuleByType(osType).get(); - softwareModuleManagement.createMetaData( - entityFactory.softwareModuleMetadata().create(module.getId()).key(knownKey).value(knownValue)); - - mockMvc.perform(delete( - MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/metadata/{{metadataKey}", - module.getId(), knownKey)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document(pathParameters( - parameterWithName("softwareModuleId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("{metadataKey").description(MgmtApiModelProperties.META_DATA_KEY)))); - } - - @Test - @Description(" Get a single meta data value for a meta data key." + " Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getMetadataValue() throws Exception { - - // prepare and create metadata - final String knownKey = "knownKey"; - final String knownValue = "knownValue"; - final SoftwareModule module = testdataFactory.createDistributionSet("one").findFirstModuleByType(osType).get(); - softwareModuleManagement.createMetaData( - entityFactory.softwareModuleMetadata().create(module.getId()).key(knownKey).value(knownValue)); - - mockMvc.perform( - get(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/metadata/{metadataKey}", - module.getId(), knownKey)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters( - parameterWithName("softwareModuleId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("metadataKey").description(MgmtApiModelProperties.META_DATA_KEY)), - responseFields(fieldWithPath("key").description(MgmtApiModelProperties.META_DATA_KEY), - fieldWithPath("value").description(MgmtApiModelProperties.META_DATA_VALUE), - fieldWithPath("targetVisible") - .description(MgmtApiModelProperties.SM_META_DATA_TARGET_VISIBLE)))); - } - - @Test - @Description(" Update a single meta data value for speficic key." + " Required Permission: " - + SpPermission.UPDATE_REPOSITORY) - public void putMetadata() throws Exception { - // prepare and create metadata for update - final String knownKey = "knownKey"; - final String knownValue = "knownValue"; - final String updateValue = "valueForUpdate"; - - final SoftwareModule module = testdataFactory.createDistributionSet("one").findFirstModuleByType(osType).get(); - softwareModuleManagement.createMetaData( - entityFactory.softwareModuleMetadata().create(module.getId()).key(knownKey).value(knownValue)); - - final JSONObject jsonObject = new JSONObject().put("key", knownKey).put("value", updateValue) - .put("targetVisible", true); - - mockMvc.perform( - put(MgmtRestConstants.SOFTWAREMODULE_V1_REQUEST_MAPPING + "/{softwareModuleId}/metadata/{metadataKey}", - module.getId(), knownKey).contentType(MediaTypes.HAL_JSON).content(jsonObject.toString())) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("softwareModuleId") - .description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("metadataKey").description(MgmtApiModelProperties.META_DATA_KEY)), - requestFields(requestFieldWithPath("key").description(MgmtApiModelProperties.META_DATA_KEY), - requestFieldWithPath("value").description(MgmtApiModelProperties.META_DATA_VALUE), - requestFieldWithPath("targetVisible") - .description(MgmtApiModelProperties.SM_META_DATA_TARGET_VISIBLE)), - responseFields(fieldWithPath("key").description(MgmtApiModelProperties.META_DATA_KEY), - fieldWithPath("value").description(MgmtApiModelProperties.META_DATA_VALUE), - fieldWithPath("targetVisible") - .description(MgmtApiModelProperties.SM_META_DATA_TARGET_VISIBLE)))); - } - -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetFilterQueriesResourceDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetFilterQueriesResourceDocumentationTest.java deleted file mode 100644 index 1e47462d56..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetFilterQueriesResourceDocumentationTest.java +++ /dev/null @@ -1,274 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.mgmt.documentation; - -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.put; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; -import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; -import static org.springframework.restdocs.request.RequestDocumentation.requestParameters; -import static org.springframework.restdocs.snippet.Attributes.key; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.hawkbit.mgmt.json.model.distributionset.MgmtActionType; -import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; -import org.eclipse.hawkbit.repository.model.DistributionSet; -import org.eclipse.hawkbit.repository.model.TargetFilterQuery; -import org.eclipse.hawkbit.rest.documentation.AbstractApiRestDocumentation; -import org.eclipse.hawkbit.rest.documentation.ApiModelPropertiesGeneric; -import org.eclipse.hawkbit.rest.documentation.MgmtApiModelProperties; -import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; -import org.json.JSONObject; -import org.junit.jupiter.api.Test; -import org.springframework.http.MediaType; -import org.springframework.restdocs.payload.JsonFieldType; -import org.springframework.restdocs.snippet.Snippet; - -import com.fasterxml.jackson.core.JsonProcessingException; - -import io.qameta.allure.Description; -import io.qameta.allure.Feature; -import io.qameta.allure.Story; - -/** - * Documentation generation for Management API for {@link TargetFilterQuery}. - */ -@Feature("Spring Rest Docs Tests - TargetFilterQuery") -@Story("TargetFilterQuery Resource") -public class TargetFilterQueriesResourceDocumentationTest extends AbstractApiRestDocumentation { - - private static final String EXAMPLE_TFQ_NAME = "filter1"; - private static final String EXAMPLE_TFQ_QUERY = "name==*"; - - @Override - public String getResourceName() { - return "targetfilters"; - } - - @Test - @Description("Handles the GET request of retrieving all target filter queries within SP. Required Permission: READ_TARGET.") - public void getTargetFilterQueries() throws Exception { - createTargetFilterQueryWithDS(createDistributionSet()); - - mockMvc.perform(get(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING)).andExpect(status().isOk()) - .andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(responseFields( - fieldWithPath("size").type(JsonFieldType.NUMBER).description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("content").description(MgmtApiModelProperties.TARGET_FILTER_QUERIES_LIST), - fieldWithPath("content[].id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("content[].name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("content[].query").description(MgmtApiModelProperties.TARGET_FILTER_QUERY), - fieldWithPath("content[].autoAssignDistributionSet") - .description(MgmtApiModelProperties.TARGET_FILTER_QUERY_AUTO_ASSIGN_DS_ID) - .type(JsonFieldType.NUMBER.toString()), - fieldWithPath("content[].autoAssignActionType") - .description(MgmtApiModelProperties.ACTION_FORCE_TYPE) - .type(JsonFieldType.STRING.toString()) - .attributes(key("value").value("['forced', 'soft', 'downloadonly']")), - fieldWithPath("content[].autoAssignWeight") - .description(MgmtApiModelProperties.RESULTING_ACTIONS_WEIGHT) - .type(JsonFieldType.NUMBER.toString()), - fieldWithPath("content[].confirmationRequired") - .description(MgmtApiModelProperties.ACTION_CONFIRMATION_REQUIRED) - .type(JsonFieldType.BOOLEAN.toString()), - fieldWithPath("content[].createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("content[].createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("content[].lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT), - fieldWithPath("content[].lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY), - fieldWithPath("content[]._links.self").ignored()))); - } - - @Test - @Description("Handles the GET request of retrieving all target filter queries within SP based by parameter. Required Permission: READ_TARGET.") - public void getTargetFilterQueriesWithParameters() throws Exception { - - mockMvc.perform( - get(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "?limit=10&sort=name:ASC&offset=0&q=name==*1")) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(requestParameters( - parameterWithName("limit").attributes(key("type").value("query")) - .description(ApiModelPropertiesGeneric.LIMIT), - parameterWithName("sort").description(ApiModelPropertiesGeneric.SORT), - parameterWithName("offset").description(ApiModelPropertiesGeneric.OFFSET), - parameterWithName("q").description(ApiModelPropertiesGeneric.FIQL)))); - } - - @Test - @Description("Handles the POST request of creating a new target filter query within SP. Required Permission: CREATE_TARGET.") - public void postTargetFilterQuery() throws Exception { - final String tfqJson = createTargetFilterQueryJson(EXAMPLE_TFQ_NAME, EXAMPLE_TFQ_QUERY); - - this.mockMvc - .perform(post(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING) - .contentType(MediaType.APPLICATION_JSON).content(tfqJson)) - .andExpect(status().isCreated()).andDo(MockMvcResultPrinter.print()).andDo( - this.document.document( - requestFields(requestFieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - requestFieldWithPath("query") - .description(MgmtApiModelProperties.TARGET_FILTER_QUERY)), - getResponseFieldTargetFilterQuery(false))); - - } - - @Test - @Description("Handles the DELETE request of deleting a single target filter query within SP. Required Permission: DELETE_TARGET.") - public void deleteTargetFilterQuery() throws Exception { - final TargetFilterQuery tfq = createTargetFilterQuery(); - this.mockMvc - .perform(delete(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{targetFilterQueryId}", - tfq.getId())) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(pathParameters( - parameterWithName("targetFilterQueryId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the GET request of retrieving a single target filter query within SP. Required Permission: READ_TARGET.") - public void getTargetFilterQuery() throws Exception { - final TargetFilterQuery tfq = createTargetFilterQueryWithDS(createDistributionSet()); - - mockMvc.perform(get(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{targetFilterQueryId}", tfq.getId())) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetFilterQueryId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - getResponseFieldTargetFilterQuery(false))); - } - - @Test - @Description("Handles the PUT request of updating a target filter query within SP. Required Permission: UPDATE_TARGET.") - public void putTargetFilterQuery() throws Exception { - final TargetFilterQuery tfq = createTargetFilterQuery(); - final String targetAsJson = createTargetFilterQueryJson("newFilterName", "attribute.hwRevision==2"); - this.mockMvc - .perform(put(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{targetFilterQueryId}", tfq.getId()) - .contentType(MediaType.APPLICATION_JSON).content(targetAsJson)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetFilterQueryId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields(optionalRequestFieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - optionalRequestFieldWithPath("query") - .description(MgmtApiModelProperties.TARGET_FILTER_QUERY)), - getResponseFieldTargetFilterQuery(false))); - - } - - @Test - @Description("Handles the GET request of retrieving a the auto assign distribution set of a target filter query within SP. Required Permission: READ_TARGET.") - public void getAssignDS() throws Exception { - final TargetFilterQuery tfq = createTargetFilterQueryWithDS(createDistributionSet()); - - mockMvc.perform(get(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{targetFilterQueryId}/autoAssignDS", - tfq.getId())).andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetFilterQueryId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - getResponseFieldsDistributionSet(false))); - } - - @Test - @Description("Handles the POST request of setting a distribution set for auto assignment within SP. Required Permission: CREATE_TARGET.") - public void postAutoAssignDS() throws Exception { - enableMultiAssignments(); - enableConfirmationFlow(); - - final TargetFilterQuery tfq = createTargetFilterQuery(); - final DistributionSet distributionSet = createDistributionSet(); - final String autoAssignBody = new JSONObject().put("id", distributionSet.getId()) - .put("type", MgmtActionType.SOFT.getName()).put("weight", 200).toString(); - - this.mockMvc - .perform( - post(MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{targetFilterQueryId}/autoAssignDS", - tfq.getId()).contentType(MediaType.APPLICATION_JSON).content(autoAssignBody.toString())) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetFilterQueryId") - .description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields(requestFieldWithPath("id").description(MgmtApiModelProperties.DS_ID), - optionalRequestFieldWithPath("type") - .description(MgmtApiModelProperties.ACTION_FORCE_TYPE) - .attributes(key("value").value("['forced', 'soft', 'downloadonly']")), - requestFieldWithPathMandatoryInMultiAssignMode("weight") - .description(MgmtApiModelProperties.RESULTING_ACTIONS_WEIGHT) - .attributes(key("value").value("0 - 1000")), - optionalRequestFieldWithPath("confirmationRequired") - .description(MgmtApiModelProperties.ACTION_CONFIRMATION_REQUIRED) - .type(JsonFieldType.BOOLEAN.toString())), - getResponseFieldTargetFilterQuery(false))); - } - - @Test - @Description("Handles the DELETE request of deleting the auto assign distribution set from a target filter query within SP. Required Permission: DELETE_TARGET.") - public void deleteAutoAssignDS() throws Exception { - final TargetFilterQuery tfq = createTargetFilterQueryWithDS(createDistributionSet()); - this.mockMvc - .perform(delete( - MgmtRestConstants.TARGET_FILTER_V1_REQUEST_MAPPING + "/{targetFilterQueryId}/autoAssignDS", - tfq.getId())) - .andExpect(status().isNoContent()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(pathParameters( - parameterWithName("targetFilterQueryId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - private Snippet getResponseFieldTargetFilterQuery(final boolean isArray) { - final String arrayPrefix = getArrayPrefix(isArray); - return responseFields(fieldWithPath(arrayPrefix + "id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath(arrayPrefix + "name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath(arrayPrefix + "query").description(MgmtApiModelProperties.TARGET_FILTER_QUERY), - fieldWithPath(arrayPrefix + "autoAssignDistributionSet") - .description(MgmtApiModelProperties.TARGET_FILTER_QUERY_AUTO_ASSIGN_DS_ID) - .type(JsonFieldType.NUMBER.toString()), - fieldWithPath(arrayPrefix + "autoAssignActionType") - .description(MgmtApiModelProperties.ACTION_FORCE_TYPE).type(JsonFieldType.STRING.toString()) - .attributes(key("value").value("['forced', 'soft', 'downloadonly']")), - fieldWithPath(arrayPrefix + "autoAssignWeight") - .description(MgmtApiModelProperties.RESULTING_ACTIONS_WEIGHT) - .type(JsonFieldType.NUMBER.toString()), - fieldWithPath(arrayPrefix + "confirmationRequired") - .description(MgmtApiModelProperties.ACTION_CONFIRMATION_REQUIRED) - .type(JsonFieldType.BOOLEAN.toString()), - fieldWithPath(arrayPrefix + "createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath(arrayPrefix + "createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath(arrayPrefix + "lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT), - fieldWithPath(arrayPrefix + "lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY), - fieldWithPath(arrayPrefix + "_links.self").ignored(), fieldWithPath(arrayPrefix + "_links.autoAssignDS") - .description(MgmtApiModelProperties.TARGET_FILTER_QUERY_LINK_AUTO_ASSIGN_DS)); - } - - private String createTargetFilterQueryJson(final String name, final String query) - throws JsonProcessingException { - final Map target = new HashMap<>(); - target.put("name", name); - target.put("query", query); - return objectMapper.writeValueAsString(target); - } - - private TargetFilterQuery createTargetFilterQuery() { - return targetFilterQueryManagement - .create(entityFactory.targetFilterQuery().create().name(EXAMPLE_TFQ_NAME).query(EXAMPLE_TFQ_QUERY)); - } - - private TargetFilterQuery createTargetFilterQueryWithDS(final DistributionSet distributionSet) { - final TargetFilterQuery targetFilterQuery = createTargetFilterQuery(); - return targetFilterQueryManagement.updateAutoAssignDS(entityFactory.targetFilterQuery() - .updateAutoAssign(targetFilterQuery.getId()).ds(distributionSet.getId())); - } -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetResourceDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetResourceDocumentationTest.java deleted file mode 100644 index ee68a04454..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetResourceDocumentationTest.java +++ /dev/null @@ -1,1043 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.mgmt.documentation; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants.TARGET_V1_ACTIVATE_AUTO_CONFIRM; -import static org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants.TARGET_V1_AUTO_CONFIRM; -import static org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants.TARGET_V1_DEACTIVATE_AUTO_CONFIRM; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.put; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; -import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; -import static org.springframework.restdocs.request.RequestDocumentation.requestParameters; -import static org.springframework.restdocs.snippet.Attributes.key; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.eclipse.hawkbit.im.authentication.SpPermission; -import org.eclipse.hawkbit.mgmt.json.model.target.MgmtTargetAutoConfirmUpdate; -import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; -import org.eclipse.hawkbit.repository.ActionStatusFields; -import org.eclipse.hawkbit.repository.model.Action; -import org.eclipse.hawkbit.repository.model.Action.ActionType; -import org.eclipse.hawkbit.repository.model.DistributionSet; -import org.eclipse.hawkbit.repository.model.DistributionSetType; -import org.eclipse.hawkbit.repository.model.Target; -import org.eclipse.hawkbit.repository.model.TargetType; -import org.eclipse.hawkbit.rest.documentation.AbstractApiRestDocumentation; -import org.eclipse.hawkbit.rest.documentation.ApiModelPropertiesGeneric; -import org.eclipse.hawkbit.rest.documentation.MgmtApiModelProperties; -import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; -import org.json.JSONArray; -import org.json.JSONObject; -import org.junit.jupiter.api.Test; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Sort.Direction; -import org.springframework.hateoas.MediaTypes; -import org.springframework.http.MediaType; -import org.springframework.restdocs.payload.FieldDescriptor; -import org.springframework.restdocs.payload.JsonFieldType; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.google.common.collect.Lists; - -import io.qameta.allure.Description; -import io.qameta.allure.Feature; -import io.qameta.allure.Story; - -/** - * Documentation generation for Management API for {@link Target}. - * - */ -@Feature("Spring Rest Docs Tests - Target") -@Story("Target Resource") -public class TargetResourceDocumentationTest extends AbstractApiRestDocumentation { - - private final String targetId = "137"; - - @Override - public String getResourceName() { - return "targets"; - } - - @Test - @Description("Handles the GET request of retrieving all targets within SP. Required Permission: READ_TARGET.") - public void getTargets() throws Exception { - enableConfirmationFlow(); - - createTargetByGivenNameWithAttributes(targetId, createDistributionSet()); - - mockMvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING)).andExpect(status().isOk()) - .andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(responseFields( - fieldWithPath("size").type(JsonFieldType.NUMBER).description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("content").description(MgmtApiModelProperties.TARGET_LIST), - fieldWithPath("content[].createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("content[].address").description(MgmtApiModelProperties.ADDRESS), - fieldWithPath("content[].createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("content[].name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("content[].description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("content[].controllerId").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("content[].updateStatus").description(MgmtApiModelProperties.UPDATE_STATUS) - .type("enum").attributes( - key("value").value("['error', 'in_sync', 'pending', 'registered', 'unknown']")), - fieldWithPath("content[].securityToken").description(MgmtApiModelProperties.SECURITY_TOKEN), - fieldWithPath("content[].requestAttributes") - .description(MgmtApiModelProperties.REQUEST_ATTRIBUTES), - fieldWithPath("content[].autoConfirmActive") - .description(MgmtApiModelProperties.AUTO_CONFIRM_ACTIVE), - fieldWithPath("content[].installedAt").description(MgmtApiModelProperties.INSTALLED_AT), - fieldWithPath("content[].lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT).type("Number"), - fieldWithPath("content[].lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY).type("String"), - fieldWithPath("content[].ipAddress").description(MgmtApiModelProperties.IP_ADDRESS) - .type("String"), - fieldWithPath("content[].lastControllerRequestAt") - .description(MgmtApiModelProperties.LAST_REQUEST_AT).type("Number"), - fieldWithPath("content[].targetType").description(MgmtApiModelProperties.TARGETTYPE_ID) - .type("Number"), - fieldWithPath("content[].targetTypeName").description(MgmtApiModelProperties.TARGETTYPE_NAME) - .type("String"), - fieldWithPath("content[]._links.self").ignored()))); - } - - @Test - @Description("Handles the GET request of retrieving all targets within SP based by parameter. Required Permission: READ_TARGET.") - public void getTargetsWithParameters() throws Exception { - mockMvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "?limit=10&sort=name:ASC&offset=0&q=name==a")) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(getFilterRequestParamter())); - } - - @Test - @Description("Handles the POST request of creating new targets within SP. The request body must always be a list of targets. Required Permission: CREATE_TARGET.") - public void postTargets() throws Exception { - enableConfirmationFlow(); - - final TargetType defaultType = testdataFactory.createTargetType("defaultType", Collections.emptyList()); - final String target = createTargetJsonForPostRequest("123456", "controllerId", "test", defaultType); - - mockMvc.perform(post(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING) - .contentType(MediaType.APPLICATION_JSON).content(target)).andExpect(status().isCreated()) - .andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(requestFields( - requestFieldWithPath("[]controllerId").description(ApiModelPropertiesGeneric.ITEM_ID), - requestFieldWithPath("[]name").description(ApiModelPropertiesGeneric.NAME), - optionalRequestFieldWithPath("[]description").description(ApiModelPropertiesGeneric.DESCRPTION), - optionalRequestFieldWithPath("[]address").description(MgmtApiModelProperties.ADDRESS), - optionalRequestFieldWithPath("[]securityToken") - .description(MgmtApiModelProperties.SECURITY_TOKEN), - optionalRequestFieldWithPath("[]targetType").description(MgmtApiModelProperties.TARGETTYPE_ID)), - responseFields(fieldWithPath("[]controllerId").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("[]name").description(ApiModelPropertiesGeneric.NAME), - fieldWithPath("[]description").description(ApiModelPropertiesGeneric.DESCRPTION), - fieldWithPath("[]address").description(MgmtApiModelProperties.ADDRESS), - fieldWithPath("[]createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("[]lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY), - fieldWithPath("[]lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT), - fieldWithPath("[]ipAddress").description(MgmtApiModelProperties.IP_ADDRESS), - fieldWithPath("[]createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("[]updateStatus").description(MgmtApiModelProperties.UPDATE_STATUS) - .type("enum") - .attributes(key("value") - .value("['error', 'in_sync', 'pending', 'registered', 'unknown']")), - fieldWithPath("[]securityToken").description(MgmtApiModelProperties.SECURITY_TOKEN), - fieldWithPath("[]requestAttributes") - .description(MgmtApiModelProperties.REQUEST_ATTRIBUTES), - fieldWithPath("[]cleanedUp").description(MgmtApiModelProperties.IS_CLEANED_UP), - fieldWithPath("[]isCleanedUp").description(MgmtApiModelProperties.IS_CLEANED_UP), - fieldWithPath("[]autoConfirmActive") - .description(MgmtApiModelProperties.AUTO_CONFIRM_ACTIVE), - fieldWithPath("[]targetType").description(MgmtApiModelProperties.TARGETTYPE_ID), - fieldWithPath("[]targetTypeName").description(MgmtApiModelProperties.TARGETTYPE_NAME), - fieldWithPath("[]_links.self").ignored()))); - } - - @Test - @Description("Handles the DELETE request of deleting a single target within SP. Required Permission: DELETE_TARGET.") - public void deleteTarget() throws Exception { - final Target target = testdataFactory.createTarget(targetId); - - mockMvc.perform(delete(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}", target.getControllerId())) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()).andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the GET request of retrieving a single target within SP. Required Permission: READ_TARGET.") - public void getTarget() throws Exception { - enableConfirmationFlow(); - - final Target target = createTargetByGivenNameWithAttributes(targetId, createDistributionSet()); - - mockMvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}", target.getControllerId())) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - getResponseFieldTarget(false))); - } - - @Test - @Description("Handles the PUT request of updating a target within SP. Required Permission: UPDATE_TARGET.") - public void putTarget() throws Exception { - enableConfirmationFlow(); - - final Target target = createTargetByGivenNameWithAttributes(targetId, createDistributionSet()); - final long targetTypeId = target.getTargetType().getId(); - - final String targetAsJson = createJsonTarget(targetId, "newTargetName", "I've been updated", targetTypeId); - - mockMvc.perform(put(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}", target.getControllerId()) - .contentType(MediaType.APPLICATION_JSON).content(targetAsJson)).andExpect(status().isOk()) - .andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields(optionalRequestFieldWithPath("name").description(ApiModelPropertiesGeneric.NAME), - optionalRequestFieldWithPath("description") - .description(ApiModelPropertiesGeneric.DESCRPTION), - optionalRequestFieldWithPath("controllerId") - .description(ApiModelPropertiesGeneric.ITEM_ID), - optionalRequestFieldWithPath("address").description(MgmtApiModelProperties.ADDRESS), - optionalRequestFieldWithPath("securityToken") - .description(MgmtApiModelProperties.SECURITY_TOKEN), - optionalRequestFieldWithPath("requestAttributes") - .description(MgmtApiModelProperties.REQUEST_ATTRIBUTES), - optionalRequestFieldWithPath("targetType").description(MgmtApiModelProperties.TARGETTYPE_ID - + ". If value of -1 provided the target type will be unassigned.")), - getResponseFieldTarget(false))); - } - - @Test - @Description("Handles the GET request of retrieving the full action history of a specific target. Required Permission: READ_TARGET.") - public void getActionsFromTarget() throws Exception { - enableMultiAssignments(); - generateRolloutActionForTarget(targetId); - - mockMvc.perform( - get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" + MgmtRestConstants.TARGET_V1_ACTIONS, - targetId)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields( - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("content[]").description(MgmtApiModelProperties.ACTION_LIST), - fieldWithPath("content[].createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("content[].createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("content[].lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY).type("String"), - fieldWithPath("content[].lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT).type("String"), - fieldWithPath("content[].type").description(MgmtApiModelProperties.ACTION_TYPE) - .attributes(key("value").value("['update', 'cancel']")), - - fieldWithPath("content[].status") - .description(MgmtApiModelProperties.ACTION_EXECUTION_STATUS) - .attributes(key("value").value("['finished', 'pending']")), - fieldWithPath("content[].detailStatus") - .description(MgmtApiModelProperties.ACTION_DETAIL_STATUS) - .attributes(key("value").value( - "['finished', 'error', 'running', 'warning', 'scheduled', 'canceling', 'canceled', 'download', 'downloaded', 'retrieved', 'cancel_rejected']")), - fieldWithPath("content[]._links").description(MgmtApiModelProperties.LINK_TO_ACTION), - fieldWithPath("content[].id").description(MgmtApiModelProperties.ACTION_ID), - fieldWithPath("content[].weight").description(MgmtApiModelProperties.ACTION_WEIGHT), - fieldWithPath("content[].rollout").description(MgmtApiModelProperties.ACTION_ROLLOUT), - fieldWithPath("content[].rolloutName") - .description(MgmtApiModelProperties.ACTION_ROLLOUT_NAME)))); - } - - @Test - @Description("Handles the GET request of retrieving the full action history of a specific target with maintenance window. Required Permission: READ_TARGET.") - public void getActionsFromTargetWithMaintenanceWindow() throws Exception { - enableMultiAssignments(); - generateActionForTarget(targetId, true, false, getTestSchedule(2), getTestDuration(1), getTestTimeZone()); - - mockMvc.perform( - get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" + MgmtRestConstants.TARGET_V1_ACTIONS, - targetId)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields( - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("content[]").description(MgmtApiModelProperties.ACTION_LIST), - fieldWithPath("content[].createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("content[].createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("content[].lastModifiedBy") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY).type("String"), - fieldWithPath("content[].lastModifiedAt") - .description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT).type("String"), - fieldWithPath("content[].type").description(MgmtApiModelProperties.ACTION_TYPE) - .attributes(key("value").value("['update', 'cancel']")), - fieldWithPath("content[].status") - .description(MgmtApiModelProperties.ACTION_EXECUTION_STATUS) - .attributes(key("value").value("['finished', 'pending']")), - fieldWithPath("content[].detailStatus") - .description(MgmtApiModelProperties.ACTION_DETAIL_STATUS) - .attributes(key("value").value( - "['finished', 'error', 'running', 'warning', 'scheduled', 'canceling', 'canceled', 'download', 'downloaded', 'retrieved', 'cancel_rejected']")), - fieldWithPath("content[]._links.self") - .description(MgmtApiModelProperties.LINK_TO_ACTION), - fieldWithPath("content[].id").description(MgmtApiModelProperties.ACTION_ID), - fieldWithPath("content[].weight").description(MgmtApiModelProperties.ACTION_WEIGHT), - fieldWithPath("content[].maintenanceWindow") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW), - fieldWithPath("content[].maintenanceWindow.schedule") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_SCHEDULE), - fieldWithPath("content[].maintenanceWindow.duration") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_DURATION), - fieldWithPath("content[].maintenanceWindow.timezone") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_TIMEZONE), - fieldWithPath("content[].maintenanceWindow.nextStartAt") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_NEXT_START_AT)))); - } - - @Test - @Description("Handles the GET request of retrieving all targets within SP based by parameter. Required Permission: READ_TARGET.") - public void getActionsFromTargetWithParameters() throws Exception { - generateActionForTarget(targetId); - - mockMvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/" + targetId + "/" - + MgmtRestConstants.TARGET_V1_ACTIONS + "?limit=10&sort=id:ASC&offset=0&q=status==pending")) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(requestParameters( - parameterWithName("limit").attributes(key("type").value("query")) - .description(ApiModelPropertiesGeneric.LIMIT), - parameterWithName("sort").description(ApiModelPropertiesGeneric.SORT), - parameterWithName("offset").description(ApiModelPropertiesGeneric.OFFSET), - parameterWithName("q").description(ApiModelPropertiesGeneric.FIQL)))); - } - - @Test - @Description("Cancels an active action, only active actions can be deleted. Required Permission: UPDATE_TARGET.") - public void deleteActionFromTarget() throws Exception { - final Action actions = generateActionForTarget(targetId, false); - - mockMvc.perform(delete(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" - + MgmtRestConstants.TARGET_V1_ACTIONS + "/{actionId}", targetId, actions.getId())) - .andExpect(status().isNoContent()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("actionId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Optionally force quits an active action, only active actions can be deleted. Required Permission: UPDATE_TARGET.") - public void deleteActionFromTargetWithParameters() throws Exception { - final Action action = generateActionForTarget(targetId, false); - deploymentManagement.cancelAction(action.getId()); - - mockMvc.perform(delete(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" - + MgmtRestConstants.TARGET_V1_ACTIONS + "/{actionId}?force=true", targetId, action.getId())) - .andExpect(status().isNoContent()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("actionId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestParameters(parameterWithName("force").description(MgmtApiModelProperties.FORCE)))); - } - - @Test - @Description("Handles the GET request of retrieving a specific action on a specific target. Required Permission: READ_TARGET.") - public void getActionFromTarget() throws Exception { - enableMultiAssignments(); - final Action action = generateRolloutActionForTarget(targetId, true, true); - provideCodeFeedback(action, 200); - - assertThat(deploymentManagement.findAction(action.getId()).get().getActionType()) - .isEqualTo(ActionType.TIMEFORCED); - - mockMvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" - + MgmtRestConstants.TARGET_V1_ACTIONS + "/{actionId}", targetId, action.getId())) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("actionId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("id").description(MgmtApiModelProperties.ACTION_ID), - fieldWithPath("weight").description(MgmtApiModelProperties.ACTION_WEIGHT), - fieldWithPath("lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY) - .type("String"), - fieldWithPath("lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT) - .type("String"), - fieldWithPath("type").description(MgmtApiModelProperties.ACTION_TYPE) - .attributes(key("value").value("['update', 'cancel']")), - fieldWithPath("forceType").description(MgmtApiModelProperties.ACTION_FORCE_TYPE) - .attributes(key("value").value("['forced', 'soft', 'timeforced']")), - fieldWithPath("forceTime").description(MgmtApiModelProperties.ACTION_FORCE_TIME) - .type("String"), - fieldWithPath("status").description(MgmtApiModelProperties.ACTION_EXECUTION_STATUS) - .attributes(key("value").value("['finished', 'pending']")), - fieldWithPath("detailStatus").description(MgmtApiModelProperties.ACTION_DETAIL_STATUS) - .attributes(key("value").value( - "['finished', 'error', 'running', 'warning', 'scheduled', 'canceling', 'canceled', 'download', 'downloaded', 'retrieved', 'cancel_rejected']")), - optionalRequestFieldWithPath("lastStatusCode") - .description(MgmtApiModelProperties.ACTION_LAST_STATUS_CODE).type("Integer"), - fieldWithPath("rollout").description(MgmtApiModelProperties.ACTION_ROLLOUT), - fieldWithPath("rolloutName").description(MgmtApiModelProperties.ACTION_ROLLOUT_NAME), - fieldWithPath("_links.self").ignored(), - fieldWithPath("_links.distributionset").description(MgmtApiModelProperties.LINK_TO_DS), - fieldWithPath("_links.status") - .description(MgmtApiModelProperties.LINKS_ACTION_STATUSES), - fieldWithPath("_links.rollout").description(MgmtApiModelProperties.LINK_TO_ROLLOUT), - fieldWithPath("_links.target").description(MgmtApiModelProperties.LINK_TO_TARGET)))); - } - - @Test - @Description("Handles the GET request of retrieving a specific action on a specific target. Required Permission: READ_TARGET.") - public void getActionFromTargetWithMaintenanceWindow() throws Exception { - enableMultiAssignments(); - final Action action = generateActionForTarget(targetId, true, true, getTestSchedule(2), getTestDuration(1), - getTestTimeZone()); - provideCodeFeedback(action, 200); - - mockMvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" - + MgmtRestConstants.TARGET_V1_ACTIONS + "/{actionId}", targetId, action.getId())) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("actionId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("id").description(MgmtApiModelProperties.ACTION_ID), - fieldWithPath("weight").description(MgmtApiModelProperties.ACTION_WEIGHT), - fieldWithPath("lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY) - .type("String"), - fieldWithPath("lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT) - .type("String"), - fieldWithPath("type").description(MgmtApiModelProperties.ACTION_TYPE) - .attributes(key("value").value("['update', 'cancel']")), - fieldWithPath("forceType").description(MgmtApiModelProperties.ACTION_FORCE_TYPE) - .attributes(key("value").value("['forced', 'soft', 'timeforced']")), - fieldWithPath("forceTime").description(MgmtApiModelProperties.ACTION_FORCE_TIME) - .type("String"), - fieldWithPath("status").description(MgmtApiModelProperties.ACTION_EXECUTION_STATUS) - .attributes(key("value").value("['finished', 'pending']")), - fieldWithPath("detailStatus").description(MgmtApiModelProperties.ACTION_DETAIL_STATUS) - .attributes(key("value").value( - "['finished', 'error', 'running', 'warning', 'scheduled', 'canceling', 'canceled', 'download', 'downloaded', 'retrieved', 'cancel_rejected']")), - optionalRequestFieldWithPath("lastStatusCode") - .description(MgmtApiModelProperties.ACTION_LAST_STATUS_CODE).type("Integer"), - fieldWithPath("maintenanceWindow") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW), - fieldWithPath("maintenanceWindow.schedule") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_SCHEDULE), - fieldWithPath("maintenanceWindow.duration") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_DURATION), - fieldWithPath("maintenanceWindow.timezone") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_TIMEZONE), - fieldWithPath("maintenanceWindow.nextStartAt") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_NEXT_START_AT), - fieldWithPath("_links.self").ignored(), - fieldWithPath("_links.distributionset").description(MgmtApiModelProperties.LINK_TO_DS), - fieldWithPath("_links.status") - .description(MgmtApiModelProperties.LINKS_ACTION_STATUSES), - fieldWithPath("_links.target").description(MgmtApiModelProperties.LINK_TO_TARGET)))); - } - - @Test - @Description("Handles the PUT request to switch an action from soft to forced. Required Permission: UPDATE_TARGET.") - public void switchActionToForced() throws Exception { - final Target target = testdataFactory.createTarget(targetId); - final DistributionSet set = testdataFactory.createDistributionSet(); - final Long actionId = getFirstAssignedActionId( - assignDistributionSet(set.getId(), target.getControllerId(), ActionType.SOFT)); - assertThat(deploymentManagement.findAction(actionId).get().getActionType()).isEqualTo(ActionType.SOFT); - - final Map body = new HashMap<>(); - body.put("forceType", "forced"); - - mockMvc.perform(put(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" - + MgmtRestConstants.TARGET_V1_ACTIONS + "/{actionId}", targetId, actionId) - .content(this.objectMapper.writeValueAsString(body)).contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("actionId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields( - requestFieldWithPath("forceType").description(MgmtApiModelProperties.ACTION_FORCED)), - responseFields(fieldWithPath("createdBy").description(ApiModelPropertiesGeneric.CREATED_BY), - fieldWithPath("createdAt").description(ApiModelPropertiesGeneric.CREATED_AT), - fieldWithPath("id").description(MgmtApiModelProperties.ACTION_ID), - fieldWithPath("lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY) - .type("String"), - fieldWithPath("lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT) - .type("String"), - fieldWithPath("type").description(MgmtApiModelProperties.ACTION_TYPE) - .attributes(key("value").value("['update', 'cancel']")), - fieldWithPath("forceType").description(MgmtApiModelProperties.ACTION_FORCE_TYPE) - .attributes(key("value").value("['forced', 'soft', 'timeforced']")), - fieldWithPath("status").description(MgmtApiModelProperties.ACTION_EXECUTION_STATUS) - .attributes(key("value").value("['finished', 'pending']")), - fieldWithPath("detailStatus").description(MgmtApiModelProperties.ACTION_DETAIL_STATUS) - .attributes(key("value").value( - "['finished', 'error', 'running', 'warning', 'scheduled', 'canceling', 'canceled', 'download', 'downloaded', 'retrieved', 'cancel_rejected']")), - fieldWithPath("_links.self").ignored(), - fieldWithPath("_links.distributionset").description(MgmtApiModelProperties.LINK_TO_DS), - fieldWithPath("_links.status") - .description(MgmtApiModelProperties.LINKS_ACTION_STATUSES), - fieldWithPath("_links.target").description(MgmtApiModelProperties.LINK_TO_TARGET)))); - } - - @Test - @Description("Handles the GET request of retrieving a specific action on a specific target. Required Permission: READ_TARGET.") - public void getStatusFromAction() throws Exception { - final Action action = generateActionForTarget(targetId, false); - provideCodeFeedback(action, 200); - - mockMvc.perform( - get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" + MgmtRestConstants.TARGET_V1_ACTIONS - + "/{actionId}/" + MgmtRestConstants.TARGET_V1_ACTION_STATUS, targetId, action.getId())) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("actionId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields( - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("content[]").description(MgmtApiModelProperties.ACTION_STATUS_LIST), - fieldWithPath("content[].id").description(ApiModelPropertiesGeneric.ITEM_ID), - fieldWithPath("content[].messages") - .description(MgmtApiModelProperties.ACTION_STATUS_MESSAGES).type("String"), - fieldWithPath("content[].reportedAt") - .description(MgmtApiModelProperties.ACTION_STATUS_REPORTED_AT).type("String"), - optionalRequestFieldWithPath("content[].code") - .description(MgmtApiModelProperties.ACTION_STATUS_CODE).type("Integer"), - fieldWithPath("content[].type").description(MgmtApiModelProperties.ACTION_STATUS_TYPE) - .attributes(key("value").value( - "['finished', 'error', 'warning', 'running', 'canceled', 'canceling', " // - + "'retrieved', 'download', 'scheduled', 'cancel_rejected', " // - + "'downloaded', 'wait_for_confirmation']"))))); - } - - @Test - @Description("Handles the GET request of retrieving all targets within SP based by parameter. Required Permission: READ_TARGET.") - public void getStatusFromActionWithParameters() throws Exception { - final Action action = generateActionForTarget(targetId); - - mockMvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/" + targetId + "/" - + MgmtRestConstants.TARGET_V1_ACTIONS + "/" + action.getId() + "/" - + MgmtRestConstants.TARGET_V1_ACTION_STATUS + "?limit=10&sort=id:ASC&offset=0")) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - requestParameters(parameterWithName("limit").description(ApiModelPropertiesGeneric.LIMIT), - parameterWithName("sort").description(ApiModelPropertiesGeneric.SORT), - parameterWithName("offset").description(ApiModelPropertiesGeneric.OFFSET)))); - } - - @Test - @Description("Handles the GET request of retrieving the assigned distribution set of an specific target. Required Permission: READ_TARGET.") - public void getAssignedDistributionSetFromAction() throws Exception { - generateActionForTarget(targetId); - - mockMvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" - + MgmtRestConstants.TARGET_V1_ASSIGNED_DISTRIBUTION_SET, targetId)).andExpect(status().isOk()) - .andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - getResponseFieldsDistributionSet(false))); - } - - @Test - @Description("Handles the POST request for assigning a distribution set to a specific target. Required Permission: READ_REPOSITORY and UPDATE_TARGET.") - public void postAssignDistributionSetToTarget() throws Exception { - // create target and ds, and assign ds - testdataFactory.createTarget(targetId + "-old"); - final DistributionSet set = testdataFactory.createDistributionSet("one"); - assignDistributionSet(set.getId(), targetId + "-old"); - - testdataFactory.createTarget(targetId); - - final long forceTime = System.currentTimeMillis(); - final String body = new JSONObject().put("id", set.getId()).put("type", "timeforced") - .put("forcetime", forceTime) - .put("maintenanceWindow", new JSONObject().put("schedule", getTestSchedule(100)) - .put("duration", getTestDuration(10)).put("timezone", getTestTimeZone())) - .toString(); - - mockMvc.perform(post(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" - + MgmtRestConstants.TARGET_V1_ASSIGNED_DISTRIBUTION_SET, targetId).content(body) - .contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestParameters(parameterWithName("offline") - .description(MgmtApiModelProperties.OFFLINE_UPDATE).optional()), - requestFields(requestFieldWithPath("id").description(ApiModelPropertiesGeneric.ITEM_ID), - requestFieldWithPathMandatoryInMultiAssignMode("weight") - .description(MgmtApiModelProperties.ASSIGNMENT_WEIGHT) - .type(JsonFieldType.NUMBER).attributes(key("value").value("0 - 1000")), - optionalRequestFieldWithPath("forcetime").description(MgmtApiModelProperties.FORCETIME), - optionalRequestFieldWithPath("[].confirmationRequired") - .description(MgmtApiModelProperties.ASSIGNMENT_CONFIRMATION_REQUIRED) - .type(JsonFieldType.BOOLEAN.toString()), - optionalRequestFieldWithPath("maintenanceWindow") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW), - optionalRequestFieldWithPath("maintenanceWindow.schedule") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_SCHEDULE), - optionalRequestFieldWithPath("maintenanceWindow.duration") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_DURATION), - optionalRequestFieldWithPath("maintenanceWindow.timezone") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_TIMEZONE), - optionalRequestFieldWithPath("type").description(MgmtApiModelProperties.ASSIGNMENT_TYPE) - .attributes( - key("value").value("['soft', 'forced','timeforced', 'downloadonly']"))), - responseFields(getDsAssignmentResponseFieldDescriptors()))); - } - - @Test - @Description("Handles the POST request for assigning distribution sets to a specific target. Required Permission: READ_REPOSITORY and UPDATE_TARGET.") - public void postAssignDistributionSetsToTarget() throws Exception { - // create target and ds, and assign ds - final List sets = testdataFactory.createDistributionSets(2); - testdataFactory.createTarget(targetId); - - final long forceTime = System.currentTimeMillis(); - final JSONArray body = new JSONArray(); - body.put( - new JSONObject().put("id", sets.get(1).getId()).put("weight", 500).put("type", "timeforced") - .put("forcetime", forceTime).put("maintenanceWindow", - new JSONObject().put("schedule", getTestSchedule(100)) - .put("duration", getTestDuration(10)).put("timezone", getTestTimeZone()))) - .toString(); - body.put(new JSONObject().put("id", sets.get(0).getId()).put("type", "forced").put("weight", 800) - .put("confirmationRequired", true)); - - enableMultiAssignments(); - mockMvc.perform(post(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" - + MgmtRestConstants.TARGET_V1_ASSIGNED_DISTRIBUTION_SET, targetId).content(body.toString()) - .contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestParameters(parameterWithName("offline") - .description(MgmtApiModelProperties.OFFLINE_UPDATE).optional()), - requestFields(requestFieldWithPath("[].id").description(ApiModelPropertiesGeneric.ITEM_ID), - requestFieldWithPathMandatoryInMultiAssignMode("[].weight") - .description(MgmtApiModelProperties.ASSIGNMENT_WEIGHT) - .attributes(key("value").value("0 - 1000")), - optionalRequestFieldWithPath("[].forcetime") - .description(MgmtApiModelProperties.FORCETIME), - optionalRequestFieldWithPath("[].confirmationRequired") - .description(MgmtApiModelProperties.ASSIGNMENT_CONFIRMATION_REQUIRED) - .type(JsonFieldType.BOOLEAN.toString()), - optionalRequestFieldWithPath("[].maintenanceWindow") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW), - optionalRequestFieldWithPath("[].maintenanceWindow.schedule") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_SCHEDULE), - optionalRequestFieldWithPath("[].maintenanceWindow.duration") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_DURATION), - optionalRequestFieldWithPath("[].maintenanceWindow.timezone") - .description(MgmtApiModelProperties.MAINTENANCE_WINDOW_TIMEZONE), - optionalRequestFieldWithPath("[].type") - .description(MgmtApiModelProperties.ASSIGNMENT_TYPE) - .attributes(key("[].value") - .value("['soft', 'forced','timeforced', 'downloadonly']"))), - responseFields(getDsAssignmentResponseFieldDescriptors()))); - } - - private static FieldDescriptor[] getDsAssignmentResponseFieldDescriptors() { - final FieldDescriptor[] descriptors = { - fieldWithPath("assigned").description(MgmtApiModelProperties.DS_NEW_ASSIGNED_TARGETS), - fieldWithPath("alreadyAssigned").type(JsonFieldType.NUMBER) - .description(MgmtApiModelProperties.DS_ALREADY_ASSIGNED_TARGETS), - fieldWithPath("assignedActions").type(JsonFieldType.ARRAY) - .description(MgmtApiModelProperties.DS_NEW_ASSIGNED_ACTIONS), - fieldWithPath("assignedActions.[].id").type(JsonFieldType.NUMBER) - .description(MgmtApiModelProperties.ACTION_ID), - fieldWithPath("assignedActions.[]._links.self").type(JsonFieldType.OBJECT) - .description(MgmtApiModelProperties.LINK_TO_ACTION), - fieldWithPath("total").type(JsonFieldType.NUMBER) - .description(MgmtApiModelProperties.DS_TOTAL_ASSIGNED_TARGETS) }; - return descriptors; - } - - @Test - @Description("Handles the GET request of retrieving the attributes of a specific target. Reponse is a key/value list. Required Permission: READ_TARGET.") - public void getControllerAttributes() throws Exception { - // create target with attributes - final Map knownControllerAttrs = new HashMap<>(); - knownControllerAttrs.put("a", "1"); - knownControllerAttrs.put("b", "2"); - final Target target = testdataFactory.createTarget(targetId); - controllerManagement.updateControllerAttributes(targetId, knownControllerAttrs, null); - - // test query target over rest resource - mockMvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/attributes", target.getName())) - .andDo(MockMvcResultPrinter.print()).andExpect(status().is2xxSuccessful()) - .andExpect(jsonPath("$.a", equalTo("1"))).andExpect(jsonPath("$.b", equalTo("2"))) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the GET request of retrieving the installed distribution set of an specific target. Required Permission: READ_TARGET.") - public void getInstalledDistributionSetFromTarget() throws Exception { - final Target target = createTargetByGivenNameWithAttributes(targetId, createDistributionSet()); - - mockMvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" - + MgmtRestConstants.TARGET_V1_INSTALLED_DISTRIBUTION_SET, target.getName())).andExpect(status().isOk()) - .andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - getResponseFieldsDistributionSet(false))); - } - - @Test - @Description("Get a paged list of meta data for a target with standard page size." + " Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getMetadata() throws Exception { - final int totalMetadata = 4; - final String knownKeyPrefix = "knownKey"; - final String knownValuePrefix = "knownValue"; - final Target testTarget = testdataFactory.createTarget(targetId); - for (int index = 0; index < totalMetadata; index++) { - targetManagement.createMetaData(testTarget.getControllerId(), Lists.newArrayList( - entityFactory.generateTargetMetadata(knownKeyPrefix + index, knownValuePrefix + index))); - } - - mockMvc.perform( - get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/metadata", testTarget.getControllerId())) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("content").description(MgmtApiModelProperties.META_DATA), - fieldWithPath("content[].key").description(MgmtApiModelProperties.META_DATA_KEY), - fieldWithPath("content[].value").description(MgmtApiModelProperties.META_DATA_VALUE)))); - } - - @Test - @Description("Get a paged list of meta data for a target with defined page size and sorting by name descending and key starting with 'known'." - + " Required Permission: " + SpPermission.READ_REPOSITORY) - public void getMetadataWithParameters() throws Exception { - final int totalMetadata = 4; - - final String knownKeyPrefix = "knownKey"; - final String knownValuePrefix = "knownValue"; - final Target testTarget = testdataFactory.createTarget(targetId); - for (int index = 0; index < totalMetadata; index++) { - targetManagement.createMetaData(testTarget.getControllerId(), Lists.newArrayList( - entityFactory.generateTargetMetadata(knownKeyPrefix + index, knownValuePrefix + index))); - } - - mockMvc.perform( - get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/metadata", testTarget.getControllerId()) - .param("offset", "1").param("limit", "2").param("sort", "key:DESC").param("q", "key==known*")) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - requestParameters( - parameterWithName("limit").attributes(key("type").value("query")) - .description(ApiModelPropertiesGeneric.LIMIT), - parameterWithName("sort").description(ApiModelPropertiesGeneric.SORT), - parameterWithName("offset").description(ApiModelPropertiesGeneric.OFFSET), - parameterWithName("q").description(ApiModelPropertiesGeneric.FIQL)), - responseFields(fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("content").description(MgmtApiModelProperties.META_DATA), - fieldWithPath("content[].key").description(MgmtApiModelProperties.META_DATA_KEY), - fieldWithPath("content[].value").description(MgmtApiModelProperties.META_DATA_VALUE)))); - } - - @Test - @Description("Get a single meta data value for a meta data key." + " Required Permission: " - + SpPermission.READ_REPOSITORY) - public void getMetadataValue() throws Exception { - - // prepare and create metadata - final String knownKey = "knownKey"; - final String knownValue = "knownValue"; - final Target testTarget = testdataFactory.createTarget(targetId); - targetManagement.createMetaData(testTarget.getControllerId(), - Collections.singletonList(entityFactory.generateTargetMetadata(knownKey, knownValue))); - - mockMvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/metadata/{metadatakey}", - testTarget.getControllerId(), knownKey)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("metadatakey").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields(fieldWithPath("key").description(MgmtApiModelProperties.META_DATA_KEY), - fieldWithPath("value").description(MgmtApiModelProperties.META_DATA_VALUE)))); - } - - @Test - @Description("Update a single meta data value for specific key." + " Required Permission: " - + SpPermission.UPDATE_REPOSITORY) - public void updateMetadata() throws Exception { - // prepare and create metadata for update - final String knownKey = "knownKey"; - final String knownValue = "knownValue"; - final String updateValue = "valueForUpdate"; - - final Target testTarget = testdataFactory.createTarget(targetId); - targetManagement.createMetaData(testTarget.getControllerId(), - Collections.singletonList(entityFactory.generateTargetMetadata(knownKey, knownValue))); - - final JSONObject jsonObject = new JSONObject().put("key", knownKey).put("value", updateValue); - - mockMvc.perform(put(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/metadata/{metadatakey}", - testTarget.getControllerId(), knownKey) - .contentType(MediaType.APPLICATION_JSON).content(jsonObject.toString())) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("metadatakey").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields(requestFieldWithPath("key").description(MgmtApiModelProperties.META_DATA_KEY), - requestFieldWithPath("value").description(MgmtApiModelProperties.META_DATA_VALUE)), - responseFields(fieldWithPath("key").description(MgmtApiModelProperties.META_DATA_KEY), - fieldWithPath("value").description(MgmtApiModelProperties.META_DATA_VALUE)))); - - } - - @Test - @Description("Delete a single meta data." + " Required Permission: " + SpPermission.UPDATE_REPOSITORY) - public void deleteMetadata() throws Exception { - // prepare and create metadata for deletion - final String knownKey = "knownKey"; - final String knownValue = "knownValue"; - - final Target testTarget = testdataFactory.createTarget(targetId); - targetManagement.createMetaData(testTarget.getControllerId(), - Collections.singletonList(entityFactory.generateTargetMetadata(knownKey, knownValue))); - - mockMvc.perform(delete(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/metadata/{key}", - testTarget.getControllerId(), knownKey)).andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("key").description(ApiModelPropertiesGeneric.ITEM_ID)))); - - } - - @Test - @Description("Create a list of meta data entries" + " Required Permission: " + SpPermission.READ_REPOSITORY - + " and " + SpPermission.UPDATE_TARGET) - public void createMetadata() throws Exception { - - final Target testTarget = testdataFactory.createTarget(targetId); - - final String knownKey1 = "knownKey1"; - final String knownKey2 = "knownKey2"; - - final String knownValue1 = "knownValue1"; - final String knownValue2 = "knownValue2"; - - final JSONArray jsonArray = new JSONArray(); - jsonArray.put(new JSONObject().put("key", knownKey1).put("value", knownValue1)); - jsonArray.put(new JSONObject().put("key", knownKey2).put("value", knownValue2)); - - mockMvc.perform( - post(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/metadata", testTarget.getControllerId()) - .contentType(MediaType.APPLICATION_JSON).content(jsonArray.toString())) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isCreated()) - .andExpect(content().contentType(MediaTypes.HAL_JSON)) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields(requestFieldWithPath("[]key").description(MgmtApiModelProperties.META_DATA_KEY), - optionalRequestFieldWithPath("[]value") - .description(MgmtApiModelProperties.META_DATA_VALUE)))); - } - - @Test - @Description("Update the target type of a target." + " Required Permission: " + SpPermission.UPDATE_TARGET) - public void postAssignTargetType() throws Exception { - final Target testTarget = testdataFactory.createTarget(targetId); - final DistributionSetType distributionSetTypeA = testdataFactory.findOrCreateDistributionSetType("jar", "jar"); - final DistributionSetType distributionSetTypeB = testdataFactory.findOrCreateDistributionSetType("zip", "zip"); - final TargetType targetType = testdataFactory.createTargetType("deviceType-A", - Arrays.asList(distributionSetTypeA, distributionSetTypeB)); - - final JSONObject jsonObject = new JSONObject(); - jsonObject.put("id", targetType.getId()); - - mockMvc.perform(post(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/targettype", - testTarget.getControllerId(), targetType.getId()).content(String.valueOf(jsonObject)) - .contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields(requestFieldWithPath("id").description(MgmtApiModelProperties.TARGETTYPE_ID)))); - } - - @Test - @Description("Reset the target type of a target." + " Required Permission: " + SpPermission.UPDATE_TARGET) - public void deleteUnassignTargetType() throws Exception { - final Target testTarget = testdataFactory.createTarget(targetId); - final DistributionSetType distributionSetTypeA = testdataFactory.findOrCreateDistributionSetType("jar", "jar"); - final DistributionSetType distributionSetTypeB = testdataFactory.findOrCreateDistributionSetType("zip", "zip"); - final TargetType targetType = testdataFactory.createTargetType("deviceType-A", - Arrays.asList(distributionSetTypeA, distributionSetTypeB)); - targetManagement.assignType(testTarget.getControllerId(), targetType.getId()); - - mockMvc.perform(delete(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/targettype", - testTarget.getControllerId()).contentType(MediaType.APPLICATION_JSON)) - .andDo(MockMvcResultPrinter.print()).andExpect(status().isOk()).andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the GET request of retrieving the auto-confirm state of a target. In this case auto-confirm is active for the requested target. Required Permission: READ_TARGET.") - public void getTargetAutoConfirmStateActive() throws Exception { - final Target testTarget = testdataFactory.createTarget(targetId); - confirmationManagement.activateAutoConfirmation(testTarget.getControllerId(), "custom_initiator_value", - "custom_remark"); - - mockMvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" + TARGET_V1_AUTO_CONFIRM, - testTarget.getControllerId())).andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields( - fieldWithPath("active").description(MgmtApiModelProperties.AUTO_CONFIRM_STATE_ACTIVE), - fieldWithPath("initiator") - .description(MgmtApiModelProperties.AUTO_CONFIRM_STATE_INITIATOR), - fieldWithPath("remark").description(MgmtApiModelProperties.AUTO_CONFIRM_STATE_REMARK), - fieldWithPath("activatedAt") - .description(MgmtApiModelProperties.AUTO_CONFIRM_STATE_ACTIVATED_AT), - fieldWithPath("_links.deactivate").optional().description( - MgmtApiModelProperties.AUTO_CONFIRM_STATE_REFERENCE_DEACTIVATE_AUTO_CONFIRM)))); - } - - @Test - @Description("Handles the GET request of retrieving the auto-confirm state of a target. In this case auto-confirm is not active for the requested target. Required Permission: READ_TARGET.") - public void getTargetAutoConfirmStateNotActive() throws Exception { - final Target testTarget = testdataFactory.createTarget(targetId); - - mockMvc.perform(get(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" + TARGET_V1_AUTO_CONFIRM, - testTarget.getControllerId())).andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - responseFields( - fieldWithPath("active").description(MgmtApiModelProperties.AUTO_CONFIRM_STATE_ACTIVE), - fieldWithPath("_links.activate").optional().description( - MgmtApiModelProperties.AUTO_CONFIRM_STATE_REFERENCE_ACTIVATE_AUTO_CONFIRM)))); - } - - @Test - @Description("Handles the POST request to activate auto-confirm on a target. Payload can be provided to specify more details about the operation. Required Permission: UPDATE_TARGET.") - public void postActivateAutoConfirm() throws Exception { - final Target testTarget = testdataFactory.createTarget(targetId); - - final MgmtTargetAutoConfirmUpdate body = new MgmtTargetAutoConfirmUpdate("custom_initiator_value", - "custom_remark_value"); - - mockMvc.perform(post(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" + TARGET_V1_AUTO_CONFIRM + "/" - + TARGET_V1_ACTIVATE_AUTO_CONFIRM, testTarget.getControllerId()) - .content(this.objectMapper.writeValueAsString(body)).contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)), - requestFields( - optionalRequestFieldWithPath("initiator") - .description(MgmtApiModelProperties.AUTO_CONFIRM_ACTIVATE_INITIATOR), - optionalRequestFieldWithPath("remark") - .description(MgmtApiModelProperties.AUTO_CONFIRM_ACTIVATE_REMARK)))); - } - - @Test - @Description("Handles the POST request to deactivate auto-confirm on a target. Required Permission: UPDATE_TARGET.") - public void postDeactivateAutoConfirm() throws Exception { - final Target testTarget = testdataFactory.createTarget(targetId); - confirmationManagement.activateAutoConfirmation(testTarget.getControllerId(), null, null); - - mockMvc.perform(post(MgmtRestConstants.TARGET_V1_REQUEST_MAPPING + "/{targetId}/" + TARGET_V1_AUTO_CONFIRM + "/" - + TARGET_V1_DEACTIVATE_AUTO_CONFIRM, testTarget.getControllerId())).andExpect(status().isOk()) - .andDo(MockMvcResultPrinter.print()).andDo(this.document.document( - pathParameters(parameterWithName("targetId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - private String createTargetJsonForPostRequest(final String controllerId, final String name, - final String description, final TargetType targetType) throws JsonProcessingException { - final Map target = new HashMap<>(); - target.put("controllerId", controllerId); - target.put("description", description); - target.put("name", name); - target.put("address", "https://192.168.0.1"); - target.put("securityToken", "2345678DGGDGFTDzztgf"); - target.put("targetType", targetType.getId()); - return "[" + this.objectMapper.writeValueAsString(target) + "]"; - } - - private String createJsonTarget(final String controllerId, final String name, final String description, final long targetTypeId) - throws JsonProcessingException { - final Map target = new HashMap<>(); - target.put("controllerId", controllerId); - target.put("description", description); - target.put("name", name); - target.put("address", "https://192.168.0.1"); - target.put("securityToken", "2345678DGGDGFTDzztgf"); - target.put("requestAttributes", true); - target.put("targetType", targetTypeId); - return this.objectMapper.writeValueAsString(target); - } - - private Action generateActionForTarget(final String knownControllerId) throws Exception { - return generateActionForTarget(knownControllerId, true, false, null, null, null); - } - - private Action generateRolloutActionForTarget(final String knownControllerId) throws Exception { - return generateActionForTarget(knownControllerId, true, false, null, null, null, true); - } - - private Action generateActionForTarget(final String knownControllerId, final boolean inSync) throws Exception { - return generateActionForTarget(knownControllerId, inSync, false, null, null, null); - } - - private Action generateRolloutActionForTarget(final String knownControllerId, final boolean inSync, - final boolean timeforced) throws Exception { - return generateActionForTarget(knownControllerId, inSync, timeforced, null, null, null, true); - } - - private Action generateActionForTarget(final String knownControllerId, final boolean inSync, - final boolean timeforced, final String maintenanceWindowSchedule, final String maintenanceWindowDuration, - final String maintenanceWindowTimeZone) throws Exception { - return generateActionForTarget(knownControllerId, inSync, timeforced, maintenanceWindowSchedule, - maintenanceWindowDuration, maintenanceWindowTimeZone, false); - } - - private Action generateActionForTarget(final String knownControllerId, final boolean inSync, - final boolean timeforced, final String maintenanceWindowSchedule, final String maintenanceWindowDuration, - final String maintenanceWindowTimeZone, final boolean createRollout) throws Exception { - final PageRequest pageRequest = PageRequest.of(0, 1, Direction.ASC, ActionStatusFields.ID.getFieldName()); - - createTargetByGivenNameWithAttributes(knownControllerId, inSync, timeforced, createDistributionSet(), - maintenanceWindowSchedule, maintenanceWindowDuration, maintenanceWindowTimeZone, createRollout); - - final List actions = deploymentManagement.findActionsAll(pageRequest).getContent(); - - assertThat(actions).hasSize(1); - return actions.get(0); - } - -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetTagResourceDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetTagResourceDocumentationTest.java deleted file mode 100644 index f2de5dfd03..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TargetTagResourceDocumentationTest.java +++ /dev/null @@ -1,313 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.mgmt.documentation; - -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.put; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; -import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtAssignedTargetRequestBody; -import org.eclipse.hawkbit.mgmt.json.model.tag.MgmtTagRequestBodyPut; -import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; -import org.eclipse.hawkbit.repository.model.DistributionSet; -import org.eclipse.hawkbit.repository.model.Target; -import org.eclipse.hawkbit.repository.model.TargetTag; -import org.eclipse.hawkbit.rest.documentation.AbstractApiRestDocumentation; -import org.eclipse.hawkbit.rest.documentation.ApiModelPropertiesGeneric; -import org.eclipse.hawkbit.rest.documentation.DocumenationResponseFieldsSnippet; -import org.eclipse.hawkbit.rest.documentation.MgmtApiModelProperties; -import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.http.MediaType; -import org.springframework.restdocs.payload.FieldDescriptor; -import org.springframework.restdocs.payload.JsonFieldType; -import org.springframework.restdocs.snippet.Snippet; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; - -import io.qameta.allure.Description; -import io.qameta.allure.Feature; -import io.qameta.allure.Story; - -/** - * Documentation generation for Management API for {@link TargetTag}. - * - */ -@Feature("Spring Rest Docs Tests - TargetTag") -@Story("TargetTag Resource") -public class TargetTagResourceDocumentationTest extends AbstractApiRestDocumentation { - - private DistributionSet distributionSet; - - @Override - public String getResourceName() { - return "targettag"; - } - - @BeforeEach - public void setUp() { - distributionSet = createDistributionSet(); - } - - @Test - @Description("Handles the GET request of retrieving all target tags") - public void getTargetTags() throws Exception { - createTargetTagEntitiy(); - arrayPrefix = "content[]."; - mockMvc.perform(get(MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING)).andExpect(status().isOk()) - .andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(getResponseFieldTargetTag(true, - fieldWithPath("size").type(JsonFieldType.NUMBER).description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("content").description(MgmtApiModelProperties.TARGET_TAG_LIST)))); - } - - @Test - @Description("Handles the GET request of retrieving all targets tags within SP based by parameter") - public void getTargetTagsWithParameters() throws Exception { - createTargetTagEntitiy(); - mockMvc.perform(get( - MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING + "?limit=10&sort=name:ASC&offset=0&q=name==targetTag")) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(getFilterRequestParamter())); - } - - @Test - @Description("Handles the GET request of retrieving all target tag within SP. Required Permission: READ_TARGET.") - public void getTargetTag() throws Exception { - final Long tagId = createTargetTagId(); - mockMvc.perform(get(MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING + "/{targetTagId}", tagId)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetTagId").description(ApiModelPropertiesGeneric.ITEM_ID)), - getResponseFieldTargetTag(false))); - } - - @Test - @Description(" Handles the POST request of creating new target tags. The request body must always be a list of tags") - public void createTargetTags() throws Exception { - final MgmtTagRequestBodyPut bodyPut = new MgmtTagRequestBodyPut(); - bodyPut.setColour("red"); - bodyPut.setDescription("target tag description"); - bodyPut.setName("target tag"); - final ObjectMapper mapper = new ObjectMapper(); - final String json = mapper.writeValueAsString(Arrays.asList(bodyPut)); - this.mockMvc - .perform(post(MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING).content(json) - .contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isCreated()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(getRequestFieldsTargetTag(true), getResponseFieldTargetTag(true))); - } - - @Test - @Description("Handles the PUT request of updating a single target tag.") - public void updateTagretTag() throws Exception { - final Long tagId = createTargetTagId(); - final MgmtTagRequestBodyPut bodyPut = new MgmtTagRequestBodyPut(); - bodyPut.setColour("red"); - bodyPut.setDescription("target tag description"); - bodyPut.setName("target tag"); - final ObjectMapper mapper = new ObjectMapper(); - final String json = mapper.writeValueAsString(bodyPut); - - this.mockMvc - .perform(put(MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING + "/{targetTagId}", tagId).content(json) - .contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetTagId").description(ApiModelPropertiesGeneric.ITEM_ID)), - getRequestFieldsTargetTag(false), getResponseFieldTargetTag(false))); - - } - - @Test - @Description("Handles the DELETE request for a single target tag") - public void deleteTargetTag() throws Exception { - final Long tagId = createTargetTagId(); - this.mockMvc - .perform(delete(MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING + "/{targetTagId}", tagId) - .contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(pathParameters( - parameterWithName("targetTagId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - @Test - @Description("Handles the GET request of retrieving all assigned targets by the given") - public void getAssignedTargets() throws Exception { - enableConfirmationFlow(); - - final TargetTag tag = createTargetTagEntitiy(); - final Target target = createTargetByGivenNameWithAttributes("Target1", distributionSet); - targetManagement.assignTag(Arrays.asList(target.getControllerId()), tag.getId()); - - arrayPrefix = "content[]."; - this.mockMvc - .perform(get(MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING - + MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING, tag.getId()) - .contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetTagId").description(ApiModelPropertiesGeneric.ITEM_ID)), - getResponseFieldTarget(true, - fieldWithPath("size").type(JsonFieldType.NUMBER) - .description(ApiModelPropertiesGeneric.SIZE), - fieldWithPath("total").description(ApiModelPropertiesGeneric.TOTAL_ELEMENTS), - fieldWithPath("content").description(MgmtApiModelProperties.TARGET_TAG_LIST)))); - } - - @Test - @Description("Handles the POST request to toggle the assignment of targets by the given tag id") - public void toggleTagAssignment() throws Exception { - final Target assignTarget = createTargetByGivenNameWithAttributes("AssignedTarget", distributionSet); - final Target unassignTarget = createTargetByGivenNameWithAttributes("UnassignedTarget", distributionSet); - final Long tagId = createTargetTagId(); - final MgmtAssignedTargetRequestBody assignedTargetRequestBody1 = new MgmtAssignedTargetRequestBody(); - assignedTargetRequestBody1 - .setControllerId(createTargetByGivenNameWithAttributes("Target1", distributionSet).getControllerId()); - final ObjectMapper mapper = new ObjectMapper(); - final String json = mapper.writeValueAsString(Arrays.asList(assignedTargetRequestBody1)); - - this.mockMvc - .perform(post(MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING - + MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING + "/toggleTagAssignment", tagId) - .content(json).contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetTagId").description(ApiModelPropertiesGeneric.ITEM_ID)), - getRequestFieldsTargetAssignment(true), - getResponseAssignmentResult(assignTarget, unassignTarget) - - )); - } - - @Test - @Description("Handles the POST request to assign targets to the given tag id") - public void assignTargets() throws Exception { - enableConfirmationFlow(); - - final Long tagId = createTargetTagId(); - final MgmtAssignedTargetRequestBody assignedTargetRequestBody1 = new MgmtAssignedTargetRequestBody(); - assignedTargetRequestBody1 - .setControllerId(createTargetByGivenNameWithAttributes("Target1", distributionSet).getControllerId()); - final ObjectMapper mapper = new ObjectMapper(); - final String json = mapper.writeValueAsString(Arrays.asList(assignedTargetRequestBody1)); - - this.mockMvc - .perform(post(MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING - + MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING, tagId).content(json) - .contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetTagId").description(ApiModelPropertiesGeneric.ITEM_ID)), - getRequestFieldsTargetAssignment(true), getResponseFieldTarget(true))); - } - - @Test - @Description("Handles the DELETE request to unassign one target from the given tag id") - public void unassignTarget() throws Exception { - final Long tagId = createTargetTagId(); - final Target target = testdataFactory.createTarget(); - - this.mockMvc - .perform(delete( - MgmtRestConstants.TARGET_TAG_V1_REQUEST_MAPPING - + MgmtRestConstants.TARGET_TAG_TARGETS_REQUEST_MAPPING + "/{controllerId}", - tagId, target.getControllerId()).contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("targetTagId").description(ApiModelPropertiesGeneric.ITEM_ID), - parameterWithName("controllerId").description(ApiModelPropertiesGeneric.ITEM_ID)))); - } - - private Snippet getRequestFieldsTargetTag(final boolean isArray) { - final String arrayPrefix = getArrayPrefix(isArray); - - return requestFields(requestFieldWithPath(arrayPrefix + "name").description(ApiModelPropertiesGeneric.NAME), - requestFieldWithPath(arrayPrefix + "description").description(ApiModelPropertiesGeneric.DESCRPTION), - optionalRequestFieldWithPath(arrayPrefix + "colour").description(ApiModelPropertiesGeneric.COLOUR)); - } - - private Snippet getRequestFieldsTargetAssignment(final boolean isArray) { - final String arrayPrefix = getArrayPrefix(isArray); - - return requestFields( - requestFieldWithPath(arrayPrefix + "controllerId").description(ApiModelPropertiesGeneric.ITEM_ID)); - } - - private Snippet getResponseFieldTargetTag(final boolean isArray) throws JsonProcessingException { - return getResponseFieldTargetTag(isArray, new FieldDescriptor[0]); - } - - private Snippet getResponseFieldTargetTag(final boolean isArray, final FieldDescriptor... descriptors) - throws JsonProcessingException { - final String arrayPrefix = getArrayPrefix(isArray); - final List allFieldDescriptor = new ArrayList<>(); - allFieldDescriptor.addAll(Arrays.asList(descriptors)); - - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "id").description(ApiModelPropertiesGeneric.ITEM_ID)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "name").description(ApiModelPropertiesGeneric.NAME)); - allFieldDescriptor - .add(fieldWithPath(arrayPrefix + "description").description(ApiModelPropertiesGeneric.DESCRPTION)); - allFieldDescriptor - .add(fieldWithPath(arrayPrefix + "createdBy").description(ApiModelPropertiesGeneric.CREATED_BY)); - allFieldDescriptor - .add(fieldWithPath(arrayPrefix + "createdAt").description(ApiModelPropertiesGeneric.CREATED_AT)); - allFieldDescriptor.add( - fieldWithPath(arrayPrefix + "lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY)); - allFieldDescriptor.add( - fieldWithPath(arrayPrefix + "lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "colour").description(ApiModelPropertiesGeneric.COLOUR)); - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "_links.self").ignored()); - - if (!isArray) { - allFieldDescriptor.add(fieldWithPath(arrayPrefix + "_links.assignedTargets") - .description(MgmtApiModelProperties.LINKS_ASSIGNED_TARGETS)); - } - - return new DocumenationResponseFieldsSnippet(allFieldDescriptor); - } - - private Snippet getResponseAssignmentResult(final Target assignTarget, final Target unAssignTarget) - throws JsonProcessingException { - return responseFields( - fieldWithPath("assignedTargets").description(MgmtApiModelProperties.ASSIGNED_TARGETS) - .type("Array[Object]"), - - fieldWithPath("unassignedTargets").description(MgmtApiModelProperties.UN_ASSIGNED_TARGETS) - .type("Array[Object]")); - } - - private TargetTag createTargetTagEntitiy(final String name) { - final TargetTag updateTargetTag = targetTagManagement.create(entityFactory.tag().create().name(name)); - return targetTagManagement.update(entityFactory.tag().update(updateTargetTag.getId()) - .description("My name is " + name).colour("default")); - } - - private TargetTag createTargetTagEntitiy() { - return createTargetTagEntitiy("targetTag"); - } - - private Long createTargetTagId() { - return createTargetTagEntitiy().getId(); - } - -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TenantResourceDocumentationTest.java b/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TenantResourceDocumentationTest.java deleted file mode 100644 index 675cb34103..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/java/org/eclipse/hawkbit/rest/mgmt/documentation/TenantResourceDocumentationTest.java +++ /dev/null @@ -1,192 +0,0 @@ -/** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. - * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - */ -package org.eclipse.hawkbit.rest.mgmt.documentation; - -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.delete; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get; -import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.put; -import static org.springframework.restdocs.payload.PayloadDocumentation.requestFields; -import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields; -import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; -import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.eclipse.hawkbit.im.authentication.SpPermission; -import org.eclipse.hawkbit.mgmt.json.model.system.MgmtSystemTenantConfigurationValueRequest; -import org.eclipse.hawkbit.mgmt.rest.api.MgmtRestConstants; -import org.eclipse.hawkbit.repository.model.TenantConfiguration; -import org.eclipse.hawkbit.rest.documentation.AbstractApiRestDocumentation; -import org.eclipse.hawkbit.rest.documentation.ApiModelPropertiesGeneric; -import org.eclipse.hawkbit.rest.documentation.MgmtApiModelProperties; -import org.eclipse.hawkbit.rest.util.MockMvcResultPrinter; -import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties; -import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties.TenantConfigurationKey; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.restdocs.payload.FieldDescriptor; - -import com.fasterxml.jackson.databind.ObjectMapper; - -import io.qameta.allure.Description; -import io.qameta.allure.Feature; -import io.qameta.allure.Story; - -/** - * Documentation generation for System API for {@link TenantConfiguration}. - */ -@Feature("Spring Rest Docs Tests - TenantConfiguration") -@Story("TenantConfiguration Resource") -public class TenantResourceDocumentationTest extends AbstractApiRestDocumentation { - - protected static final Map CONFIG_ITEM_DESCRIPTIONS = new HashMap<>(); - - static { - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.TARGET_SEARCH_ATTRIBUTES_ENABLED, - "if target text search should include target attributes"); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.TRIGGER_AUTO_ASSIGN_CHECK_BY_TARGET, - "if auto-assign check should occur when target uploads its configuration"); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_ENABLED, - "if the authentication mode 'gateway security token' is enabled."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY, - "the key of the gateway security token."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.AUTHENTICATION_MODE_HEADER_AUTHORITY_NAME, - "the name of the 'authority header'."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.AUTHENTICATION_MODE_HEADER_ENABLED, - "if the authentication mode 'authority header' is enabled."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.AUTHENTICATION_MODE_TARGET_SECURITY_TOKEN_ENABLED, - "if the authentication mode 'target security token' is enabled."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.POLLING_OVERDUE_TIME_INTERVAL, - "the period of time after the SP server will recognize a target, which is not performing pull requests anymore."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.POLLING_TIME_INTERVAL, - "the time interval between two poll requests of a target."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.MIN_POLLING_TIME_INTERVAL, - "the smallest time interval permitted between two poll requests of a target."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.MAINTENANCE_WINDOW_POLL_COUNT, - "the polling interval so that controller tries to poll at least these many times between the last " - + "polling and before start of maintenance window. The polling interval is" - + " bounded by configured pollingTime and minPollingTime. The polling" - + " interval is modified as per following scheme: pollingTime(@time=t) =" - + " (maintenanceWindowStartTime - t)/maintenanceWindowPollCount."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.ANONYMOUS_DOWNLOAD_MODE_ENABLED, - "if the anonymous download mode is enabled."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.REPOSITORY_ACTIONS_AUTOCLOSE_ENABLED, - "if autoclose running actions with new Distribution Set assignment is enabled."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.ROLLOUT_APPROVAL_ENABLED, - "if approval mode for Rollout Management is enabled."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.ACTION_CLEANUP_ENABLED, - "if automatic cleanup of deployment actions is enabled."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.ACTION_CLEANUP_ACTION_STATUS, - "the list of action status that should be taken into account for the cleanup."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.ACTION_CLEANUP_ACTION_EXPIRY, - "the expiry time in milliseconds that needs to elapse before an action may be cleaned up."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.MULTI_ASSIGNMENTS_ENABLED, - "if multiple distribution sets can be assigned to the same targets."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.BATCH_ASSIGNMENTS_ENABLED, - "if distribution set can be assigned to multiple targets in a single batch message."); - CONFIG_ITEM_DESCRIPTIONS.put(TenantConfigurationKey.USER_CONFIRMATION_ENABLED, - "if confirmation is required when distribution set is assigned to target."); - } - - @Autowired - protected TenantConfigurationProperties tenantConfigurationProperties; - - @Override - public String getResourceName() { - return "tenant"; - } - - @Test - @Description("Handles GET request for receiving all tenant specific configurations. Required Permission: " - + SpPermission.TENANT_CONFIGURATION) - public void getTenantConfigrations() throws Exception { - - mockMvc.perform(get(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/")).andExpect(status().isOk()) - .andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document(responseFields(getTenantConfigurationValuesKeyResponseFields()))); - } - - @Test - @Description("Handles GET request for receiving a tenant specific configuration. Required Permission: " - + SpPermission.TENANT_CONFIGURATION) - public void getTenantConfigration() throws Exception { - mockMvc.perform(get(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/{keyName}/", - TenantConfigurationKey.AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY)).andExpect(status().isOk()) - .andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("keyName").description(MgmtApiModelProperties.CONFIG_PARAM)), - responseFields(getTenantConfigurationValueResponseField()))); - } - - @Test - @Description("Handles PUT request for settings values in tenant specific configuration. Required Permission: " - + SpPermission.TENANT_CONFIGURATION) - public void putTenantConfigration() throws Exception { - - final MgmtSystemTenantConfigurationValueRequest bodyPut = new MgmtSystemTenantConfigurationValueRequest(); - bodyPut.setValue("exampleToken"); - final ObjectMapper mapper = new ObjectMapper(); - final String json = mapper.writeValueAsString(bodyPut); - - mockMvc.perform(put(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/{keyName}/", - TenantConfigurationKey.AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY).content(json) - .contentType(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()).andDo(MockMvcResultPrinter.print()) - .andDo(this.document.document( - pathParameters(parameterWithName("keyName").description(MgmtApiModelProperties.CONFIG_PARAM)), - requestFields(requestFieldWithPath("value").description(MgmtApiModelProperties.CONFIG_VALUE)), - responseFields(getTenantConfigurationValueResponseField()))); - } - - @Test - @Description("Handles DELETE request deleting a tenant specific configuration. Required Permission: " - + SpPermission.TENANT_CONFIGURATION) - public void deleteTenantConfigration() throws Exception { - mockMvc.perform(delete(MgmtRestConstants.SYSTEM_V1_REQUEST_MAPPING + "/configs/{keyName}/", - TenantConfigurationKey.AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY)).andExpect(status().isOk()) - .andDo(MockMvcResultPrinter.print()).andDo(this.document.document( - pathParameters(parameterWithName("keyName").description(MgmtApiModelProperties.CONFIG_PARAM)))); - } - - private FieldDescriptor[] getTenantConfigurationValuesKeyResponseFields() { - final List fields = new ArrayList<>(); - for (final TenantConfigurationKey key : tenantConfigurationProperties.getConfigurationKeys()) { - fields.add(fieldWithPath("['" + key.getKeyName() + "']").type(key.getDataType().getSimpleName()) - .description(getTenantConfigurationKeyDescription(key))); - } - return fields.toArray(new FieldDescriptor[fields.size()]); - } - - private FieldDescriptor[] getTenantConfigurationValueResponseField() { - return new FieldDescriptor[] { fieldWithPath("value").description(MgmtApiModelProperties.CONFIG_VALUE), - fieldWithPath("global").description(MgmtApiModelProperties.CONFIG_GLOBAL), - fieldWithPath("createdBy").description(ApiModelPropertiesGeneric.CREATED_BY).type("Number").optional(), - fieldWithPath("createdAt").description(ApiModelPropertiesGeneric.CREATED_AT).type("String").optional(), - fieldWithPath("lastModifiedAt").description(ApiModelPropertiesGeneric.LAST_MODIFIED_AT).type("Number") - .optional(), - fieldWithPath("lastModifiedBy").description(ApiModelPropertiesGeneric.LAST_MODIFIED_BY).type("String") - .optional(), - fieldWithPath("_links.self").ignored() }; - } - - private String getTenantConfigurationKeyDescription(final TenantConfigurationKey key) { - if (!CONFIG_ITEM_DESCRIPTIONS.containsKey(key.getKeyName())) { - throw new IllegalArgumentException("Description for key " + key.getKeyName() + " is missing."); - } - - return "The configuration key '" + key.getKeyName() + "' defines " - + CONFIG_ITEM_DESCRIPTIONS.get(key.getKeyName()); - } - -} diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/resources/org/springframework/restdocs/templates/path-parameters.snippet b/hawkbit-rest/hawkbit-rest-docs/src/test/resources/org/springframework/restdocs/templates/path-parameters.snippet deleted file mode 100644 index 067e1fb833..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/resources/org/springframework/restdocs/templates/path-parameters.snippet +++ /dev/null @@ -1,9 +0,0 @@ -|=== -|Parameter|Description - -{{#parameters}} -|{{name}} -|{{description}} - -{{/parameters}} -|=== \ No newline at end of file diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/resources/org/springframework/restdocs/templates/request-fields.snippet b/hawkbit-rest/hawkbit-rest-docs/src/test/resources/org/springframework/restdocs/templates/request-fields.snippet deleted file mode 100644 index eb6d5b353e..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/resources/org/springframework/restdocs/templates/request-fields.snippet +++ /dev/null @@ -1,12 +0,0 @@ -|=== -|Path|Type|Description|Allowed Values|Mandatory - -{{#fields}} -|{{path}} -|{{type}} -|{{description}} -|{{value}} -|{{mandatory}} -{{/fields}} - -|=== \ No newline at end of file diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/resources/org/springframework/restdocs/templates/response-fields.snippet b/hawkbit-rest/hawkbit-rest-docs/src/test/resources/org/springframework/restdocs/templates/response-fields.snippet deleted file mode 100644 index 1578cb28f0..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/resources/org/springframework/restdocs/templates/response-fields.snippet +++ /dev/null @@ -1,11 +0,0 @@ -|=== -|Path|Type|Description|Allowed Values - -{{#fields}} -|{{path}} -|{{type}} -|{{description}} -|{{value}} -{{/fields}} - -|=== \ No newline at end of file diff --git a/hawkbit-rest/hawkbit-rest-docs/src/test/resources/updateserver-restdocumentation-test.properties b/hawkbit-rest/hawkbit-rest-docs/src/test/resources/updateserver-restdocumentation-test.properties deleted file mode 100644 index 827e188058..0000000000 --- a/hawkbit-rest/hawkbit-rest-docs/src/test/resources/updateserver-restdocumentation-test.properties +++ /dev/null @@ -1,37 +0,0 @@ -# -# Copyright (c) 2018 Bosch Software Innovations GmbH and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# - -hawkbit.controller.pollingTime=12:00:00 -hawkbit.controller.pollingOverdueTime=23:59:59 - -## Configuration for building download URLs - START -# HTTP -hawkbit.artifact.url.protocols.download-http.rel=download-http -hawkbit.artifact.url.protocols.download-http.protocol=http -hawkbit.artifact.url.protocols.download-http.hostname=link-to-cdn.com -hawkbit.artifact.url.protocols.download-http.supports=DMF,DDI -hawkbit.artifact.url.protocols.download-http.ref={protocol}://{hostname}/api/v1/{tenant}/download/controller/{controllerId}/softwaremodules/{softwareModuleId}/filename/{artifactFileName} -hawkbit.artifact.url.protocols.md5sum-http.rel=md5sum-http -hawkbit.artifact.url.protocols.md5sum-http.protocol=${hawkbit.artifact.url.protocols.download-http.protocol} -hawkbit.artifact.url.protocols.md5sum-http.hostname=${hawkbit.artifact.url.protocols.download-http.hostname} -hawkbit.artifact.url.protocols.md5sum-http.supports=DDI -hawkbit.artifact.url.protocols.md5sum-http.ref=${hawkbit.artifact.url.protocols.download-http.ref}.MD5SUM - -# HTTPS -hawkbit.artifact.url.protocols.download.rel=download -hawkbit.artifact.url.protocols.download.protocol=https -hawkbit.artifact.url.protocols.download.hostname=link-to-cdn.com -hawkbit.artifact.url.protocols.download.supports=DMF,DDI -hawkbit.artifact.url.protocols.download.ref={protocol}://{hostname}/api/v1/{tenant}/download/controller/{controllerId}/softwaremodules/{softwareModuleId}/filename/{artifactFileName} -hawkbit.artifact.url.protocols.md5sum.rel=md5sum -hawkbit.artifact.url.protocols.md5sum.protocol=${hawkbit.artifact.url.protocols.download.protocol} -hawkbit.artifact.url.protocols.md5sum.hostname=${hawkbit.artifact.url.protocols.download.hostname} -hawkbit.artifact.url.protocols.md5sum.supports=DDI -hawkbit.artifact.url.protocols.md5sum.ref=${hawkbit.artifact.url.protocols.download.ref}.MD5SUM -## Configuration for building download URLs - END diff --git a/hawkbit-rest/pom.xml b/hawkbit-rest/pom.xml index 5682dc27ae..adf1431969 100644 --- a/hawkbit-rest/pom.xml +++ b/hawkbit-rest/pom.xml @@ -1,11 +1,12 @@ hawkbit-mgmt-resource hawkbit-ddi-api hawkbit-ddi-resource - hawkbit-rest-docs \ No newline at end of file diff --git a/hawkbit-runtime/.sandbox/scripts/initialize-cronjobs.sh b/hawkbit-runtime/.sandbox/scripts/initialize-cronjobs.sh index a555d3b732..c231a7dd26 100644 --- a/hawkbit-runtime/.sandbox/scripts/initialize-cronjobs.sh +++ b/hawkbit-runtime/.sandbox/scripts/initialize-cronjobs.sh @@ -1,10 +1,11 @@ # -# Copyright (c) 2018 Bosch Software Innovations GmbH and others. +# Copyright (c) 2018 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # SCRIPT_DIR="/.sandbox/scripts" diff --git a/hawkbit-runtime/.sandbox/scripts/sandbox-cleanup.sh b/hawkbit-runtime/.sandbox/scripts/sandbox-cleanup.sh index 492ebc2ef8..53781bb8d1 100644 --- a/hawkbit-runtime/.sandbox/scripts/sandbox-cleanup.sh +++ b/hawkbit-runtime/.sandbox/scripts/sandbox-cleanup.sh @@ -1,10 +1,11 @@ # -# Copyright (c) 2018 Bosch Software Innovations GmbH and others. +# Copyright (c) 2018 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # STACK_NAME=hawkbit diff --git a/hawkbit-runtime/.sandbox/stacks/proxy/docker-compose-stack.yml b/hawkbit-runtime/.sandbox/stacks/proxy/docker-compose-stack.yml index e7d9d99a87..5224f9cf43 100644 --- a/hawkbit-runtime/.sandbox/stacks/proxy/docker-compose-stack.yml +++ b/hawkbit-runtime/.sandbox/stacks/proxy/docker-compose-stack.yml @@ -1,10 +1,11 @@ # -# Copyright (c) 2018 Bosch Software Innovations GmbH and others. +# Copyright (c) 2018 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # version: '3.7' diff --git a/hawkbit-runtime/.sandbox/stacks/sandbox/docker-compose-stack.yml b/hawkbit-runtime/.sandbox/stacks/sandbox/docker-compose-stack.yml index 14622d4fc4..1a0615121d 100644 --- a/hawkbit-runtime/.sandbox/stacks/sandbox/docker-compose-stack.yml +++ b/hawkbit-runtime/.sandbox/stacks/sandbox/docker-compose-stack.yml @@ -1,10 +1,11 @@ # -# Copyright (c) 2018 Bosch Software Innovations GmbH and others. +# Copyright (c) 2018 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # version: '3.7' diff --git a/hawkbit-runtime/docker/0.2.0-mysql/Dockerfile b/hawkbit-runtime/docker/0.2.0-mysql/Dockerfile deleted file mode 100644 index ed49204117..0000000000 --- a/hawkbit-runtime/docker/0.2.0-mysql/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM hawkbit/hawkbit-update-server:0.2.0 - -MAINTAINER Kai Zimmermann - -ENV MARIADB_DRIVER_VERSION=2.2.4 - -COPY KEYS . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEYS \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ - && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \ - && apk del build-dependencies - -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.0-mysql/KEYS b/hawkbit-runtime/docker/0.2.0-mysql/KEYS deleted file mode 100644 index 4c602ae045..0000000000 --- a/hawkbit-runtime/docker/0.2.0-mysql/KEYS +++ /dev/null @@ -1,40 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQENBFSTDbABCADuZ2k4NIsmhrSyAw/49GQugqPF40P0ldkTPkKDx8b6eNFtPFJbsyw9yKqU -EIS+9eFtIEMLLR4CIHMM56adZe5q5Wp7g/+rnHgTuefVWfMg42Vaxdk8lTQIN2Z3gSsj36DZ -TtO+SmxixFfxHb2YESUvgVzeWIaFBKZCV4JdumniI02RCAPuqxIHKYmhwuqQSpzIAuZQEVvM -qSwFBUOr+CSf3+YzQ/PmFqldlQOQKbSE6G2H7E1mMhRBI07uryo1gDSM42DSFcZ+eQCzCHQr -CNC+2TtBrPkmPNU7TpngtjBthjwF/qJVVX8/q+syv524E1MtO+uXwf4PvrFJ537SkfdHABEB -AAG0OE1hcmlhREIgRW50ZXJwcmlzZSBTaWduaW5nIEtleSA8c2lnbmluZy1rZXlAbWFyaWFk -Yi5jb20+iEYEEhEIAAYFAlTeJRQACgkQy8sIKhu5Q9tQ8wCfXu/gtMah1J9a+CB1RDKt2s4C -alIAn0LqQcsEib4zrHgBeMwp6Wvre/qZiQE4BBMBAgAiBQJUkw2wAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRDOGj3V48lPSbWuCACnykjC688qarR5aCJOkjQVruc+3GaM/8Mk -8sXT8GZisJyTott6o++tdjx4GLvnBZFssLDfnZwza9rS79GJAdHqshk4t6V8GqTK8OG2IHJk -XKG0xASUTWV3+oLA2Dbw4ILmgWZxncHTnmEx+x2DGUWTshfwrqBMFy0ksKjeWMnFSzOgbTRW -1Z7z3U4cm8dZWNAD6bNQbZBaXDUk/FOTFpGwXqB7DR/y6AMpJq2i+orD0gTW5yhdSsMasHpP -5YCcztONl9Ft08EggkzhwQSzdP+R0eI6uf/wnB9G2nkGQxHsXe1oc1UqOEQpdJgPhEv4lkFP -4izB1Ix/x4YjhlkXZqGziQIcBBIBCAAGBQJU3iVrAAoJEJFxGJmV5FqejVIP/0Qm+CWS+UZ9 -39wUkV/kvfbvhCiVMQmtJDWUJVWRYDXZsfxgdAs4RaKlIrvXShUbWSrGCPwLJkg+FBjXpXqy -/1Qf/TXHrlGGDTZ+SUOfU4O0+HKNqjGdQf3yZdJzoMySY0HdE7eob74ITqnZVjL/bZXsJzZi -xxkqhXZxHi4ToHJkDE75rO2kjYXpaOdg90MiS2nvJm9pexnVvLWIfsPYfkxHaJ3WV+HOZixT -MYKtgiPG6ebiYdOTdbfY8d7uHIxoaqiednBqjpMGygb+YL3SYOWi/rj6LzLs4Z8ISM2OJg01 -2DYL6bsIkHWbf0EcuSVdZ4o5l8V+Z055KI3vRwFadU/fpBHvV1EuXcQNOgKvc19KnoG2RIMQ -/aGVekwzbxqunY2syuQjTEycJPJ02c4r0+o31ge+BQl0K8gmn3F2geS+JqjKNXdJtLYzH3bw -upKKsXmacOUAzyM+ic5BtYkDWiNAxy9Az2OxunXjeFnBjVxJxqVbSbZMlziT1I8I8QHtNNzg -yhd3rmTU3w0oQiVM7XmGPeat09QW8/ift/ABN4t0RdVCTyBtdrzUsI/eIb8NOBLw0gkAgyNe -jiMb8H4WGd4CggA9TGmN/OOpDd0PWSWWR+05oU5LeJAAuWdqSUWGr8qiAXWSnv9Jg9y0SC2C -D7XV0eudrAy94uqeooeVh+x8iQIcBBIBCAAGBQJV8eBgAAoJEEHdwLQNpW8iwDIP/RDSgy1S -43q6SMmJiOyok+kqTBaGKNqouN3TV7vual8sS77vpe/o3sr9SrcAsdiFf4Rq81aJ61ZwJ5JI -0ZnhfJhSOo/3CJiLHsQ/XH1hurmjS0VRtYiZDe8lbLHhPWJsnC96LyPrg4pHCF8SH/XmUN9F -rqq3izeezh1fOsxjPwLixtzaf3yoQI6JzFq+ENzs0PB7JzYnrcO8oGrtVdRJUQIHg3B7Kq0B -c4rc4QPNFxPTxXfQiQtkTzkJHc8I956WFkcxnXxcEJXYdre3LVBnlNkQmvyT48Z5z/jZmBWf -NFqHvndFhGgPMrlgzuMjiEnvjx1jbk2dxQNC/Ugfq2PfTsng8rsjtLTaPoSV/csfCM3Thimm -Wcs1tqfMb9q2uFRG+kR9o8w+3TY5SkY611YqSWpBcAghixOaEGrcyDwBARVZDEEfzyWCqSEd -eQsUrsNYhAiVYI+ubYNKO9rtI+SZi5EtD5nwSKLNZFwDxvRX9PIbaT2vsRNzjqeMOkpjDg7S -79lMicr7idOon4dpLl411HpClV8MnuWmekAa/L9Ee52J50ti3Rx7MDgPISJi9ZykqpPrxmt1 -A+9ZkKE6VB63nTMBOpLUh0zD4yFHYjAUyDpSTH3SLNtVu3UfkLJ+Nr7AAKoV9YQgTmu3wSPR -FsnHsQksxFhCqGYdUKyfRsobs/Ns -=ovQp ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.2.0/Dockerfile b/hawkbit-runtime/docker/0.2.0/Dockerfile deleted file mode 100644 index 50fb73c65c..0000000000 --- a/hawkbit-runtime/docker/0.2.0/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM openjdk:8u151-jre-alpine - -MAINTAINER Kai Zimmermann - -ENV HAWKBIT_VERSION=0.2.0 \ - HAWKBIT_HOME=/opt/hawkbit - -EXPOSE 8080 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && mkdir -p $HAWKBIT_HOME \ - && cd $HAWKBIT_HOME \ - && wget -O hawkbit-update-server.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ - && wget -O hawkbit-update-server.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ - && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar \ - && apk del build-dependencies - -VOLUME "$HAWKBIT_HOME/data" - -WORKDIR $HAWKBIT_HOME -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.0M4-mysql/Dockerfile b/hawkbit-runtime/docker/0.2.0M4-mysql/Dockerfile deleted file mode 100644 index 9d89b7a6ad..0000000000 --- a/hawkbit-runtime/docker/0.2.0M4-mysql/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM hawkbit/hawkbit-update-server:0.2.0M4 - -MAINTAINER Kai Zimmermann - -ENV MARIADB_DRIVER_VERSION=2.1.2 - -COPY KEYS . - -# Install mariadb driver -RUN set -x \ - && gpg --import KEYS \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ - && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar - -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=amqp,mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.0M4-mysql/KEYS b/hawkbit-runtime/docker/0.2.0M4-mysql/KEYS deleted file mode 100644 index 4c602ae045..0000000000 --- a/hawkbit-runtime/docker/0.2.0M4-mysql/KEYS +++ /dev/null @@ -1,40 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQENBFSTDbABCADuZ2k4NIsmhrSyAw/49GQugqPF40P0ldkTPkKDx8b6eNFtPFJbsyw9yKqU -EIS+9eFtIEMLLR4CIHMM56adZe5q5Wp7g/+rnHgTuefVWfMg42Vaxdk8lTQIN2Z3gSsj36DZ -TtO+SmxixFfxHb2YESUvgVzeWIaFBKZCV4JdumniI02RCAPuqxIHKYmhwuqQSpzIAuZQEVvM -qSwFBUOr+CSf3+YzQ/PmFqldlQOQKbSE6G2H7E1mMhRBI07uryo1gDSM42DSFcZ+eQCzCHQr -CNC+2TtBrPkmPNU7TpngtjBthjwF/qJVVX8/q+syv524E1MtO+uXwf4PvrFJ537SkfdHABEB -AAG0OE1hcmlhREIgRW50ZXJwcmlzZSBTaWduaW5nIEtleSA8c2lnbmluZy1rZXlAbWFyaWFk -Yi5jb20+iEYEEhEIAAYFAlTeJRQACgkQy8sIKhu5Q9tQ8wCfXu/gtMah1J9a+CB1RDKt2s4C -alIAn0LqQcsEib4zrHgBeMwp6Wvre/qZiQE4BBMBAgAiBQJUkw2wAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRDOGj3V48lPSbWuCACnykjC688qarR5aCJOkjQVruc+3GaM/8Mk -8sXT8GZisJyTott6o++tdjx4GLvnBZFssLDfnZwza9rS79GJAdHqshk4t6V8GqTK8OG2IHJk -XKG0xASUTWV3+oLA2Dbw4ILmgWZxncHTnmEx+x2DGUWTshfwrqBMFy0ksKjeWMnFSzOgbTRW -1Z7z3U4cm8dZWNAD6bNQbZBaXDUk/FOTFpGwXqB7DR/y6AMpJq2i+orD0gTW5yhdSsMasHpP -5YCcztONl9Ft08EggkzhwQSzdP+R0eI6uf/wnB9G2nkGQxHsXe1oc1UqOEQpdJgPhEv4lkFP -4izB1Ix/x4YjhlkXZqGziQIcBBIBCAAGBQJU3iVrAAoJEJFxGJmV5FqejVIP/0Qm+CWS+UZ9 -39wUkV/kvfbvhCiVMQmtJDWUJVWRYDXZsfxgdAs4RaKlIrvXShUbWSrGCPwLJkg+FBjXpXqy -/1Qf/TXHrlGGDTZ+SUOfU4O0+HKNqjGdQf3yZdJzoMySY0HdE7eob74ITqnZVjL/bZXsJzZi -xxkqhXZxHi4ToHJkDE75rO2kjYXpaOdg90MiS2nvJm9pexnVvLWIfsPYfkxHaJ3WV+HOZixT -MYKtgiPG6ebiYdOTdbfY8d7uHIxoaqiednBqjpMGygb+YL3SYOWi/rj6LzLs4Z8ISM2OJg01 -2DYL6bsIkHWbf0EcuSVdZ4o5l8V+Z055KI3vRwFadU/fpBHvV1EuXcQNOgKvc19KnoG2RIMQ -/aGVekwzbxqunY2syuQjTEycJPJ02c4r0+o31ge+BQl0K8gmn3F2geS+JqjKNXdJtLYzH3bw -upKKsXmacOUAzyM+ic5BtYkDWiNAxy9Az2OxunXjeFnBjVxJxqVbSbZMlziT1I8I8QHtNNzg -yhd3rmTU3w0oQiVM7XmGPeat09QW8/ift/ABN4t0RdVCTyBtdrzUsI/eIb8NOBLw0gkAgyNe -jiMb8H4WGd4CggA9TGmN/OOpDd0PWSWWR+05oU5LeJAAuWdqSUWGr8qiAXWSnv9Jg9y0SC2C -D7XV0eudrAy94uqeooeVh+x8iQIcBBIBCAAGBQJV8eBgAAoJEEHdwLQNpW8iwDIP/RDSgy1S -43q6SMmJiOyok+kqTBaGKNqouN3TV7vual8sS77vpe/o3sr9SrcAsdiFf4Rq81aJ61ZwJ5JI -0ZnhfJhSOo/3CJiLHsQ/XH1hurmjS0VRtYiZDe8lbLHhPWJsnC96LyPrg4pHCF8SH/XmUN9F -rqq3izeezh1fOsxjPwLixtzaf3yoQI6JzFq+ENzs0PB7JzYnrcO8oGrtVdRJUQIHg3B7Kq0B -c4rc4QPNFxPTxXfQiQtkTzkJHc8I956WFkcxnXxcEJXYdre3LVBnlNkQmvyT48Z5z/jZmBWf -NFqHvndFhGgPMrlgzuMjiEnvjx1jbk2dxQNC/Ugfq2PfTsng8rsjtLTaPoSV/csfCM3Thimm -Wcs1tqfMb9q2uFRG+kR9o8w+3TY5SkY611YqSWpBcAghixOaEGrcyDwBARVZDEEfzyWCqSEd -eQsUrsNYhAiVYI+ubYNKO9rtI+SZi5EtD5nwSKLNZFwDxvRX9PIbaT2vsRNzjqeMOkpjDg7S -79lMicr7idOon4dpLl411HpClV8MnuWmekAa/L9Ee52J50ti3Rx7MDgPISJi9ZykqpPrxmt1 -A+9ZkKE6VB63nTMBOpLUh0zD4yFHYjAUyDpSTH3SLNtVu3UfkLJ+Nr7AAKoV9YQgTmu3wSPR -FsnHsQksxFhCqGYdUKyfRsobs/Ns -=ovQp ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.2.0M4/Dockerfile b/hawkbit-runtime/docker/0.2.0M4/Dockerfile deleted file mode 100644 index 9dd3accaf8..0000000000 --- a/hawkbit-runtime/docker/0.2.0M4/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM openjdk:8u121-jre-alpine - -MAINTAINER Kai Zimmermann - -ENV HAWKBIT_VERSION=0.2.0M4 \ - HAWKBIT_HOME=/opt/hawkbit - -# Http port -EXPOSE 8080 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache gnupg unzip \ - && apk add --no-cache libressl wget \ - && gpg --import KEY \ - && mkdir -p $HAWKBIT_HOME \ - && cd $HAWKBIT_HOME \ - && wget -O hawkbit-update-server.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ - && wget -O hawkbit-update-server.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ - && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar - -VOLUME "$HAWKBIT_HOME/data" - -WORKDIR $HAWKBIT_HOME -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.0M4/KEY b/hawkbit-runtime/docker/0.2.0M4/KEY deleted file mode 100644 index 7a959f646d..0000000000 --- a/hawkbit-runtime/docker/0.2.0M4/KEY +++ /dev/null @@ -1,79 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQINBFflTWwBEAC9YoTvzZlCcQSrqPdovEmAlxlIKzPqE+06Pig87dcn+2PJDDnk9Rl9eDEH -CWKrds4mg7lVgzFApI73V7agHj9bqSyPWbp1GtReDvD4QKNEb4RM9XY8O1rStOTrznhfVIGc -oi9wKPTQWk5GXiqh6rawiyZnAfKm9WPZhKaxIi4m0zcTpJQ2dwbPi0hBpeEMJTyadId4Y+bB -AmH2qGKCOi2NXQDGDJ9BOkjLMVmPlgxnj8QBgZlUgRnVkYNjas/eVcXM5w6BQ884vUuSm35r -PelQOflmUAUiCGoE7UAhfrJdd5tOdWbn9bnCjv1eUyj2hJwJRRwRZjHvsvJygEg7T00Ntur3 -UN8fich29cjPGzjkilqK1NkRPZGROchn5MDhSoeUpGXEDL5bPAWHCNLqus6gMx5vNJ2IuNmW -rHSlsNy0pkWu88xtanjZjgX416nY7RPsmvZ1WRr04tegYB2CGO5aQWK1l+k6ciXWLqC23SAg -FE/2Edbzaxvc6jJi5cVGvvZAoH8J7wXCF0zFwORypNyXbNoiAQQnlW7LBJtJU6KihkuTjbDJ -1wmphLIdMoPTXLOxVVBTM7rsYa3ev9o9V9Z0dkAv364fO7zc/RpEoqM33NmNTzS8DUP/TF6J -UQftNJL+ExCreDqxlkyTgqf/+s/k1Z1kuYEKdRmk4MILVKGZvQARAQABtDFFY2xpcHNlIGhh -d2tCaXQgUHJvamVjdCA8aGF3a2JpdC1kZXZAZWNsaXBzZS5vcmc+iQEcBBABCAAGBQJX6nMW -AAoJEPqgpYKzPV/BDqEIAKAOy1JQjPccNwvZg8Y5OwW2QhB4lvq8ngzniSok/PAGdjsfVlJu -4zPgFkBcqgtAbXycOZXpMXQZBekfWslnDU7RtRAIZ6hJAuiJOL7qOOM3X03YHvq1HVWv2JK/ -g8NSoG1C2dw+GIsK2k4886QGX+a7pN7Mt0ZAbsVAaZx2Cig+iVc74+YW6UY6BiMOj1nGGSyG -9AT0pMgUWBbqvjpeKmiFzP5XVEL7e6pAS4jZAiYNp0xHPdYG/ANiq+hQAArmeaZa2hxOmygJ -CZvh6dYKBXMfRAQFBF8burVyhiJOV2Pn3kCxTSckaO63sZ+ayzBNrVu8Mpf0h2rIEGVVdWlx -KjyJARwEEAEIAAYFAlfrcXQACgkQZZoexg+SnXSfzQf7BWaH/x2yBzCmpbxpbUhI50bGvj6L -jasb6q68Q875ODwls9jve0ip0p7bcRwvbJ4Fd1OypwkxV3R/JdPlfkQwA4CoqHQpMOdN+iQ+ -aA8I86Z/dDL2yZS8e6cTdlRmIwC2RKAkNoy39t0P5UG3Zf6yiES0YaWB0zZQZwtBwNyOOPXD -1L2X/mKXT1yfLgc8YeBx+ojhr8LpzNZKA1vqyQ04YCYByMXy2FGqEaTHwbIZXFJ1IxIs956J -0SD929Nkw3m2/ZSONOLD0uMwb91A9lv9vRWU+bwp18S5j63N5NEEM6QsGOt9VgDhy01zdb46 -1e99V1IYkh863gCEHyJFOJi+RYkCHAQQAQgABgUCV+VPmAAKCRCforcpn1HlQ5VCD/9SxkSV -iV8sywK3cZm9lkYlnot33lAH/dYDf4md1mOf8vfNWTB0L9s5LOK9n6SWHdEKYd+f3OAP7ZM5 -Div30B/TmkyR4BgtMAkDOQSIR5+iEzXI2+iklEb1I+vhFVkKNOGoOaWRiDWZScWgwPBylYuj -iPjRAjKxtZuuhy5A4d6HkvdugoQ+4GdHeazkSeXLADz6XFBrQpUrTGCuNqdpE8QKkX4xmZ4L -Vvur3h/STBsJBfewuC4FhDTryFdd/vygivV7LrHzJlgTNqoK+oxL0wiietLtHvpwpS/gGcrq -a+8ccvPN+HhGCgpkeULEp8MUwp5fqoJxU57AZHUo/ER+6jmMSRz8V7M/VoZxwoGcH3o+paYw -GfxEPovaA6jadzEQomQTK3qsrx8nXflYPH39o3NYBM+MBLnsv6kndPqBb7OtBt2ZVges04zM -mbIYgpAUZgIOoCR75uU21DO2hbS7EHwd4nqY5vOfFSlMgtBcInjmXRiqDADspJv3938J/E2n -7M7ijERcQn6UmhCmdYLCLo2bAODp0mjjcftu6Ct65VLP1WRp95qr21VSDBoozwd9eL0AzAoC -SOhZPmDoeFoo3QcekEi4gxRtQvSdEZ0YteUENXmpSX+c/IKba5lpk4baC52HvhlNlmeu0DxX -VWqYF7O/9Z4hl2lQ5LHiSb2L0S1+6YkCPQQTAQgAJwUCV+VNbAIbLwUJCWYBgAULCQgHAwUV -CgkICwUWAgMBAAIeAQIXgAAKCRA4XLwcf2Z/rujfD/0Wp1uYXRsAzEcZavASh1Xe2301atbU -aRUy8UsNWO5oCvVjyyaPM4c3MT72sqsLyNXAWhi/MP63M0qr2+M0nN/91U8r98/Mbd+WlzRy -CLJYUX72Oqrfan+hZxcd7Xlu+sKHNshOlCy4114bVnrdq16LfeIAkx7GLw9/lMc9lRrvUwMI -684zhquROpuDD1aE/i/gBGgzd8cMoW+hdjFVA0zwe+6FgrWR2CMiKCJfeYWLuFiBNmFZC6l8 -BqiEqCuyQu6dFpWHhtK3fPJAEYIiNkORT8M3HSXl/Ex/w9ErweZKHiSja7KMAUWXkZi+Ayva -jMVI4jumXwgZW/7uuSc6bbv2SO4BSfMHvFtEuBSBWXi9e0urgqNOFQuKE7zokSbEStwG4+gN -E32ZuS2sllOxr41Nx/q2oKMeKePZBqoD5+3mDtRP432KWZjZjlhyez0Kh8aJ8lz5MM7Xxtzo -OyJeO4JHqbuBV82GvoLXVsYJBOUfRuBaZQcphUjamZwDZQFEvoKe6Ltur6+gsqu4UsQzs2bp -i26yaP3e1mrLc9Q5KAH7EkOr7wD3zo7jtJ21luGCBOtZ113oWJZgAwaevDC6cY/k32YgK8+q -iqMtNC7APznXyN4eVjKB18aSM7rVNdE8vlA818b7DbKXsqjH9N7VdiW2/4F8TJNq+OCVPjMf -pfM3KLkCDQRX6R/1ARAAplIU5GesaA42f8+idIEnozpd7aJKs8PuaOUUWr/7CmozpHNXpjPP -uPRflSRmFBeigp50xNfpLwYXjbjoVaiqdPKp6rxko0kh6NcG+pXYvCZOvWaM3e04xppREeiF -UNq8XctterVqWKC5zOgE1wY0346BgWtJvcYL9px71w2EE0bsZ/gwuphOYRblLtbmsKLwheMQ -JO2wfusPsAEGDdoaTRenEmosi/DRWt+oxodZSWygETk8fPESqcvmnjhPpVvCHksdIWEqUBXy -rg6NkkyIjLdMqeuBp/IrUN1XGBOrUgdVNpCNuiMN1Ai+6L9g364fLP7xYB84kLK+QSO03Bpv -j+D5Ca2DRweTmTaCQzaOeR2KW9kgf2tbLJbIoM2OiXLcfGN5bPvZVc2ODverOCRDiVwcVkd+ -sfbG3sUkyV+1NSYTJYTRnaNjsQmNGBfI0mI7v0zEHVt+X0tuJeP5QcMJ1lvLqBiZgZQDFVg4 -vtchDLFTv2JlLfsbyG+U2f2iLA3mauyFRS+x1ZFeIENsXwSqLn1WXvslnkV8cTs4hTFb1Skj -zC89XbjY2PUJMg2XWLeWjvv6pVGvdRVlPuujbou93SMfPSdYPqOrX4eX42I66GXuXMczbu9H -F8kk7OpyP9cYo8LpiHjuxHm/VMFLckagluXwZCl6uiIRB+IJJmd+2jcAEQEAAYkERAQYAQgA -DwUCV+kf9QIbAgUJCWYBgAIpCRA4XLwcf2Z/rsFdIAQZAQgABgUCV+kf9QAKCRBjMbgT6Sl8 -4NSbD/9ueOFntw+rs2q7hAGOq2LP3D/d7SuU+j8vUcszJK2ETQlKX9IcQs3c+T4AbpQ4O5Ea -EvvYEAVmPjosk9zn7sxiWrzvDbvfhQK6hR6zbBK2LB7yTkzBh3oT8WghbCqeTDqJMl47PUv5 -yUVsX4RHmbgo7qymRGiPJ8a+5QPOmtmdoyaEv0hGvszya4aTKexLM4fU+k+e8kupY9fTICE7 -S7zUpX7hpFYC4d/uk3KUkCvebox2C4UomT2kV518/Pnj/6wpWQ3GHnqIurMPOW097VsP3epl -jutNwXM3sH6rbgiiZqdQFb3bq1Da4fpNqnH6Rdm7fSjjV2R36qDrPQz/AfZC2fouq2Xbse6M -RKR48peb80cvtGqhc2J7FHWfEu8da/26Gxq07SOod9svR8eBcJAnlCd3Hca0T2qmaM52WvC+ -Mjxsjgg6yGh0PenjsNQM2mdhvKUflqbLluY4E2QPHVJZlT3Bo5LekM91ZZAgd4F3xBE25/WL -Akg2/rsCiulAfaEXAPQkqCaB7ajd9dvJXcq5qvWSvSgW5vL/nnyecE5ktf8todaMhMz83gpt -eXtR8Ms7401d2Qwt28NifXkgEMMNfytXg/0TO6F0uRGi67SoAeadUjug2JSr7LBmeQHyOvLR -q+0iO1m3f3pSSduqBjKWUFnJShED8FafaRUrE1+HWN2lD/0Sci1X33CrTXNSQCzdTaD3R/SJ -B+BSspEQNV/JqAPjJD9ZK3dwDm5upmrjpFNjSVvcQJoy0J1rW2q2E8y8ECuxErUWQqyFv/Co -y39WpwgWam19ykP3yNiU9UHGb58DhuMRwLOYF7o5Iwg2nbiYtHO5jSmC3PPpYz3TLvA/kSTK -1T1m6ac2dA6UMLn3t3Cohv50wpr41bxLz04ig/dEmrdP72HRpA5oNoXAXCaCeeed5R1DfxgW -RL2fP+GL6ZftTplw3AL2trJa+0zLFHvDo+M4c1brM2x0HYEoX+qSpFMxtixgV0D5Uf7RUMkN -eYPb4SZRc6wDHIt7Wqp/qlUozC94DKbFUrK4UnHyK4+HVlSQJGevqm+Y+QoqIBcnhOEN0Bzo -01aVHIZFxzk4R2bppFEDiFEw1zL2DAPj/xX7Zqrjsg/qdVu9bUklBxir6QSOwZGZMGYCuBWM -uJU3IY7Xzx/6Anm5oqbXLVLwVFwS8tED+/XYjPUo1ifLGVx96THuQrNBMhpwNE/9Qd4zbjnE -7f6foXLgeB/l2h65zrI6O1RdEAUpA8Tuhgy0PwNc/1mviaOkYx9qFlhyjruTd72TV4va+5Qb -L7wnh417OQNbpWUqb5HvN5BruDFQOBztFupi/7LHWnSX4XVO777SYzlf1a7DdJu45cql44d2 -LrdPYOGtAA== -=a0Oj ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.2.0M9-mysql/Dockerfile b/hawkbit-runtime/docker/0.2.0M9-mysql/Dockerfile deleted file mode 100644 index e407cf69f2..0000000000 --- a/hawkbit-runtime/docker/0.2.0M9-mysql/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM hawkbit/hawkbit-update-server:0.2.0M9 - -MAINTAINER Kai Zimmermann - -ENV MARIADB_DRIVER_VERSION=2.2.4 - -COPY KEYS . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEYS \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ - && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \ - && apk del build-dependencies - -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.0M9-mysql/KEYS b/hawkbit-runtime/docker/0.2.0M9-mysql/KEYS deleted file mode 100644 index 4c602ae045..0000000000 --- a/hawkbit-runtime/docker/0.2.0M9-mysql/KEYS +++ /dev/null @@ -1,40 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQENBFSTDbABCADuZ2k4NIsmhrSyAw/49GQugqPF40P0ldkTPkKDx8b6eNFtPFJbsyw9yKqU -EIS+9eFtIEMLLR4CIHMM56adZe5q5Wp7g/+rnHgTuefVWfMg42Vaxdk8lTQIN2Z3gSsj36DZ -TtO+SmxixFfxHb2YESUvgVzeWIaFBKZCV4JdumniI02RCAPuqxIHKYmhwuqQSpzIAuZQEVvM -qSwFBUOr+CSf3+YzQ/PmFqldlQOQKbSE6G2H7E1mMhRBI07uryo1gDSM42DSFcZ+eQCzCHQr -CNC+2TtBrPkmPNU7TpngtjBthjwF/qJVVX8/q+syv524E1MtO+uXwf4PvrFJ537SkfdHABEB -AAG0OE1hcmlhREIgRW50ZXJwcmlzZSBTaWduaW5nIEtleSA8c2lnbmluZy1rZXlAbWFyaWFk -Yi5jb20+iEYEEhEIAAYFAlTeJRQACgkQy8sIKhu5Q9tQ8wCfXu/gtMah1J9a+CB1RDKt2s4C -alIAn0LqQcsEib4zrHgBeMwp6Wvre/qZiQE4BBMBAgAiBQJUkw2wAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRDOGj3V48lPSbWuCACnykjC688qarR5aCJOkjQVruc+3GaM/8Mk -8sXT8GZisJyTott6o++tdjx4GLvnBZFssLDfnZwza9rS79GJAdHqshk4t6V8GqTK8OG2IHJk -XKG0xASUTWV3+oLA2Dbw4ILmgWZxncHTnmEx+x2DGUWTshfwrqBMFy0ksKjeWMnFSzOgbTRW -1Z7z3U4cm8dZWNAD6bNQbZBaXDUk/FOTFpGwXqB7DR/y6AMpJq2i+orD0gTW5yhdSsMasHpP -5YCcztONl9Ft08EggkzhwQSzdP+R0eI6uf/wnB9G2nkGQxHsXe1oc1UqOEQpdJgPhEv4lkFP -4izB1Ix/x4YjhlkXZqGziQIcBBIBCAAGBQJU3iVrAAoJEJFxGJmV5FqejVIP/0Qm+CWS+UZ9 -39wUkV/kvfbvhCiVMQmtJDWUJVWRYDXZsfxgdAs4RaKlIrvXShUbWSrGCPwLJkg+FBjXpXqy -/1Qf/TXHrlGGDTZ+SUOfU4O0+HKNqjGdQf3yZdJzoMySY0HdE7eob74ITqnZVjL/bZXsJzZi -xxkqhXZxHi4ToHJkDE75rO2kjYXpaOdg90MiS2nvJm9pexnVvLWIfsPYfkxHaJ3WV+HOZixT -MYKtgiPG6ebiYdOTdbfY8d7uHIxoaqiednBqjpMGygb+YL3SYOWi/rj6LzLs4Z8ISM2OJg01 -2DYL6bsIkHWbf0EcuSVdZ4o5l8V+Z055KI3vRwFadU/fpBHvV1EuXcQNOgKvc19KnoG2RIMQ -/aGVekwzbxqunY2syuQjTEycJPJ02c4r0+o31ge+BQl0K8gmn3F2geS+JqjKNXdJtLYzH3bw -upKKsXmacOUAzyM+ic5BtYkDWiNAxy9Az2OxunXjeFnBjVxJxqVbSbZMlziT1I8I8QHtNNzg -yhd3rmTU3w0oQiVM7XmGPeat09QW8/ift/ABN4t0RdVCTyBtdrzUsI/eIb8NOBLw0gkAgyNe -jiMb8H4WGd4CggA9TGmN/OOpDd0PWSWWR+05oU5LeJAAuWdqSUWGr8qiAXWSnv9Jg9y0SC2C -D7XV0eudrAy94uqeooeVh+x8iQIcBBIBCAAGBQJV8eBgAAoJEEHdwLQNpW8iwDIP/RDSgy1S -43q6SMmJiOyok+kqTBaGKNqouN3TV7vual8sS77vpe/o3sr9SrcAsdiFf4Rq81aJ61ZwJ5JI -0ZnhfJhSOo/3CJiLHsQ/XH1hurmjS0VRtYiZDe8lbLHhPWJsnC96LyPrg4pHCF8SH/XmUN9F -rqq3izeezh1fOsxjPwLixtzaf3yoQI6JzFq+ENzs0PB7JzYnrcO8oGrtVdRJUQIHg3B7Kq0B -c4rc4QPNFxPTxXfQiQtkTzkJHc8I956WFkcxnXxcEJXYdre3LVBnlNkQmvyT48Z5z/jZmBWf -NFqHvndFhGgPMrlgzuMjiEnvjx1jbk2dxQNC/Ugfq2PfTsng8rsjtLTaPoSV/csfCM3Thimm -Wcs1tqfMb9q2uFRG+kR9o8w+3TY5SkY611YqSWpBcAghixOaEGrcyDwBARVZDEEfzyWCqSEd -eQsUrsNYhAiVYI+ubYNKO9rtI+SZi5EtD5nwSKLNZFwDxvRX9PIbaT2vsRNzjqeMOkpjDg7S -79lMicr7idOon4dpLl411HpClV8MnuWmekAa/L9Ee52J50ti3Rx7MDgPISJi9ZykqpPrxmt1 -A+9ZkKE6VB63nTMBOpLUh0zD4yFHYjAUyDpSTH3SLNtVu3UfkLJ+Nr7AAKoV9YQgTmu3wSPR -FsnHsQksxFhCqGYdUKyfRsobs/Ns -=ovQp ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.2.0M9/Dockerfile b/hawkbit-runtime/docker/0.2.0M9/Dockerfile deleted file mode 100644 index e8e5c789b4..0000000000 --- a/hawkbit-runtime/docker/0.2.0M9/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM openjdk:8u151-jre-alpine - -MAINTAINER Kai Zimmermann - -ENV HAWKBIT_VERSION=0.2.0M9 \ - HAWKBIT_HOME=/opt/hawkbit - -EXPOSE 8080 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && mkdir -p $HAWKBIT_HOME \ - && cd $HAWKBIT_HOME \ - && wget -O hawkbit-update-server.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ - && wget -O hawkbit-update-server.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ - && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar \ - && apk del build-dependencies - -VOLUME "$HAWKBIT_HOME/data" - -WORKDIR $HAWKBIT_HOME -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.0M9/KEY b/hawkbit-runtime/docker/0.2.0M9/KEY deleted file mode 100644 index 7a959f646d..0000000000 --- a/hawkbit-runtime/docker/0.2.0M9/KEY +++ /dev/null @@ -1,79 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQINBFflTWwBEAC9YoTvzZlCcQSrqPdovEmAlxlIKzPqE+06Pig87dcn+2PJDDnk9Rl9eDEH -CWKrds4mg7lVgzFApI73V7agHj9bqSyPWbp1GtReDvD4QKNEb4RM9XY8O1rStOTrznhfVIGc -oi9wKPTQWk5GXiqh6rawiyZnAfKm9WPZhKaxIi4m0zcTpJQ2dwbPi0hBpeEMJTyadId4Y+bB -AmH2qGKCOi2NXQDGDJ9BOkjLMVmPlgxnj8QBgZlUgRnVkYNjas/eVcXM5w6BQ884vUuSm35r -PelQOflmUAUiCGoE7UAhfrJdd5tOdWbn9bnCjv1eUyj2hJwJRRwRZjHvsvJygEg7T00Ntur3 -UN8fich29cjPGzjkilqK1NkRPZGROchn5MDhSoeUpGXEDL5bPAWHCNLqus6gMx5vNJ2IuNmW -rHSlsNy0pkWu88xtanjZjgX416nY7RPsmvZ1WRr04tegYB2CGO5aQWK1l+k6ciXWLqC23SAg -FE/2Edbzaxvc6jJi5cVGvvZAoH8J7wXCF0zFwORypNyXbNoiAQQnlW7LBJtJU6KihkuTjbDJ -1wmphLIdMoPTXLOxVVBTM7rsYa3ev9o9V9Z0dkAv364fO7zc/RpEoqM33NmNTzS8DUP/TF6J -UQftNJL+ExCreDqxlkyTgqf/+s/k1Z1kuYEKdRmk4MILVKGZvQARAQABtDFFY2xpcHNlIGhh -d2tCaXQgUHJvamVjdCA8aGF3a2JpdC1kZXZAZWNsaXBzZS5vcmc+iQEcBBABCAAGBQJX6nMW -AAoJEPqgpYKzPV/BDqEIAKAOy1JQjPccNwvZg8Y5OwW2QhB4lvq8ngzniSok/PAGdjsfVlJu -4zPgFkBcqgtAbXycOZXpMXQZBekfWslnDU7RtRAIZ6hJAuiJOL7qOOM3X03YHvq1HVWv2JK/ -g8NSoG1C2dw+GIsK2k4886QGX+a7pN7Mt0ZAbsVAaZx2Cig+iVc74+YW6UY6BiMOj1nGGSyG -9AT0pMgUWBbqvjpeKmiFzP5XVEL7e6pAS4jZAiYNp0xHPdYG/ANiq+hQAArmeaZa2hxOmygJ -CZvh6dYKBXMfRAQFBF8burVyhiJOV2Pn3kCxTSckaO63sZ+ayzBNrVu8Mpf0h2rIEGVVdWlx -KjyJARwEEAEIAAYFAlfrcXQACgkQZZoexg+SnXSfzQf7BWaH/x2yBzCmpbxpbUhI50bGvj6L -jasb6q68Q875ODwls9jve0ip0p7bcRwvbJ4Fd1OypwkxV3R/JdPlfkQwA4CoqHQpMOdN+iQ+ -aA8I86Z/dDL2yZS8e6cTdlRmIwC2RKAkNoy39t0P5UG3Zf6yiES0YaWB0zZQZwtBwNyOOPXD -1L2X/mKXT1yfLgc8YeBx+ojhr8LpzNZKA1vqyQ04YCYByMXy2FGqEaTHwbIZXFJ1IxIs956J -0SD929Nkw3m2/ZSONOLD0uMwb91A9lv9vRWU+bwp18S5j63N5NEEM6QsGOt9VgDhy01zdb46 -1e99V1IYkh863gCEHyJFOJi+RYkCHAQQAQgABgUCV+VPmAAKCRCforcpn1HlQ5VCD/9SxkSV -iV8sywK3cZm9lkYlnot33lAH/dYDf4md1mOf8vfNWTB0L9s5LOK9n6SWHdEKYd+f3OAP7ZM5 -Div30B/TmkyR4BgtMAkDOQSIR5+iEzXI2+iklEb1I+vhFVkKNOGoOaWRiDWZScWgwPBylYuj -iPjRAjKxtZuuhy5A4d6HkvdugoQ+4GdHeazkSeXLADz6XFBrQpUrTGCuNqdpE8QKkX4xmZ4L -Vvur3h/STBsJBfewuC4FhDTryFdd/vygivV7LrHzJlgTNqoK+oxL0wiietLtHvpwpS/gGcrq -a+8ccvPN+HhGCgpkeULEp8MUwp5fqoJxU57AZHUo/ER+6jmMSRz8V7M/VoZxwoGcH3o+paYw -GfxEPovaA6jadzEQomQTK3qsrx8nXflYPH39o3NYBM+MBLnsv6kndPqBb7OtBt2ZVges04zM -mbIYgpAUZgIOoCR75uU21DO2hbS7EHwd4nqY5vOfFSlMgtBcInjmXRiqDADspJv3938J/E2n -7M7ijERcQn6UmhCmdYLCLo2bAODp0mjjcftu6Ct65VLP1WRp95qr21VSDBoozwd9eL0AzAoC -SOhZPmDoeFoo3QcekEi4gxRtQvSdEZ0YteUENXmpSX+c/IKba5lpk4baC52HvhlNlmeu0DxX -VWqYF7O/9Z4hl2lQ5LHiSb2L0S1+6YkCPQQTAQgAJwUCV+VNbAIbLwUJCWYBgAULCQgHAwUV -CgkICwUWAgMBAAIeAQIXgAAKCRA4XLwcf2Z/rujfD/0Wp1uYXRsAzEcZavASh1Xe2301atbU -aRUy8UsNWO5oCvVjyyaPM4c3MT72sqsLyNXAWhi/MP63M0qr2+M0nN/91U8r98/Mbd+WlzRy -CLJYUX72Oqrfan+hZxcd7Xlu+sKHNshOlCy4114bVnrdq16LfeIAkx7GLw9/lMc9lRrvUwMI -684zhquROpuDD1aE/i/gBGgzd8cMoW+hdjFVA0zwe+6FgrWR2CMiKCJfeYWLuFiBNmFZC6l8 -BqiEqCuyQu6dFpWHhtK3fPJAEYIiNkORT8M3HSXl/Ex/w9ErweZKHiSja7KMAUWXkZi+Ayva -jMVI4jumXwgZW/7uuSc6bbv2SO4BSfMHvFtEuBSBWXi9e0urgqNOFQuKE7zokSbEStwG4+gN -E32ZuS2sllOxr41Nx/q2oKMeKePZBqoD5+3mDtRP432KWZjZjlhyez0Kh8aJ8lz5MM7Xxtzo -OyJeO4JHqbuBV82GvoLXVsYJBOUfRuBaZQcphUjamZwDZQFEvoKe6Ltur6+gsqu4UsQzs2bp -i26yaP3e1mrLc9Q5KAH7EkOr7wD3zo7jtJ21luGCBOtZ113oWJZgAwaevDC6cY/k32YgK8+q -iqMtNC7APznXyN4eVjKB18aSM7rVNdE8vlA818b7DbKXsqjH9N7VdiW2/4F8TJNq+OCVPjMf -pfM3KLkCDQRX6R/1ARAAplIU5GesaA42f8+idIEnozpd7aJKs8PuaOUUWr/7CmozpHNXpjPP -uPRflSRmFBeigp50xNfpLwYXjbjoVaiqdPKp6rxko0kh6NcG+pXYvCZOvWaM3e04xppREeiF -UNq8XctterVqWKC5zOgE1wY0346BgWtJvcYL9px71w2EE0bsZ/gwuphOYRblLtbmsKLwheMQ -JO2wfusPsAEGDdoaTRenEmosi/DRWt+oxodZSWygETk8fPESqcvmnjhPpVvCHksdIWEqUBXy -rg6NkkyIjLdMqeuBp/IrUN1XGBOrUgdVNpCNuiMN1Ai+6L9g364fLP7xYB84kLK+QSO03Bpv -j+D5Ca2DRweTmTaCQzaOeR2KW9kgf2tbLJbIoM2OiXLcfGN5bPvZVc2ODverOCRDiVwcVkd+ -sfbG3sUkyV+1NSYTJYTRnaNjsQmNGBfI0mI7v0zEHVt+X0tuJeP5QcMJ1lvLqBiZgZQDFVg4 -vtchDLFTv2JlLfsbyG+U2f2iLA3mauyFRS+x1ZFeIENsXwSqLn1WXvslnkV8cTs4hTFb1Skj -zC89XbjY2PUJMg2XWLeWjvv6pVGvdRVlPuujbou93SMfPSdYPqOrX4eX42I66GXuXMczbu9H -F8kk7OpyP9cYo8LpiHjuxHm/VMFLckagluXwZCl6uiIRB+IJJmd+2jcAEQEAAYkERAQYAQgA -DwUCV+kf9QIbAgUJCWYBgAIpCRA4XLwcf2Z/rsFdIAQZAQgABgUCV+kf9QAKCRBjMbgT6Sl8 -4NSbD/9ueOFntw+rs2q7hAGOq2LP3D/d7SuU+j8vUcszJK2ETQlKX9IcQs3c+T4AbpQ4O5Ea -EvvYEAVmPjosk9zn7sxiWrzvDbvfhQK6hR6zbBK2LB7yTkzBh3oT8WghbCqeTDqJMl47PUv5 -yUVsX4RHmbgo7qymRGiPJ8a+5QPOmtmdoyaEv0hGvszya4aTKexLM4fU+k+e8kupY9fTICE7 -S7zUpX7hpFYC4d/uk3KUkCvebox2C4UomT2kV518/Pnj/6wpWQ3GHnqIurMPOW097VsP3epl -jutNwXM3sH6rbgiiZqdQFb3bq1Da4fpNqnH6Rdm7fSjjV2R36qDrPQz/AfZC2fouq2Xbse6M -RKR48peb80cvtGqhc2J7FHWfEu8da/26Gxq07SOod9svR8eBcJAnlCd3Hca0T2qmaM52WvC+ -Mjxsjgg6yGh0PenjsNQM2mdhvKUflqbLluY4E2QPHVJZlT3Bo5LekM91ZZAgd4F3xBE25/WL -Akg2/rsCiulAfaEXAPQkqCaB7ajd9dvJXcq5qvWSvSgW5vL/nnyecE5ktf8todaMhMz83gpt -eXtR8Ms7401d2Qwt28NifXkgEMMNfytXg/0TO6F0uRGi67SoAeadUjug2JSr7LBmeQHyOvLR -q+0iO1m3f3pSSduqBjKWUFnJShED8FafaRUrE1+HWN2lD/0Sci1X33CrTXNSQCzdTaD3R/SJ -B+BSspEQNV/JqAPjJD9ZK3dwDm5upmrjpFNjSVvcQJoy0J1rW2q2E8y8ECuxErUWQqyFv/Co -y39WpwgWam19ykP3yNiU9UHGb58DhuMRwLOYF7o5Iwg2nbiYtHO5jSmC3PPpYz3TLvA/kSTK -1T1m6ac2dA6UMLn3t3Cohv50wpr41bxLz04ig/dEmrdP72HRpA5oNoXAXCaCeeed5R1DfxgW -RL2fP+GL6ZftTplw3AL2trJa+0zLFHvDo+M4c1brM2x0HYEoX+qSpFMxtixgV0D5Uf7RUMkN -eYPb4SZRc6wDHIt7Wqp/qlUozC94DKbFUrK4UnHyK4+HVlSQJGevqm+Y+QoqIBcnhOEN0Bzo -01aVHIZFxzk4R2bppFEDiFEw1zL2DAPj/xX7Zqrjsg/qdVu9bUklBxir6QSOwZGZMGYCuBWM -uJU3IY7Xzx/6Anm5oqbXLVLwVFwS8tED+/XYjPUo1ifLGVx96THuQrNBMhpwNE/9Qd4zbjnE -7f6foXLgeB/l2h65zrI6O1RdEAUpA8Tuhgy0PwNc/1mviaOkYx9qFlhyjruTd72TV4va+5Qb -L7wnh417OQNbpWUqb5HvN5BruDFQOBztFupi/7LHWnSX4XVO777SYzlf1a7DdJu45cql44d2 -LrdPYOGtAA== -=a0Oj ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.2.1-mysql/Dockerfile b/hawkbit-runtime/docker/0.2.1-mysql/Dockerfile deleted file mode 100644 index d9423518a1..0000000000 --- a/hawkbit-runtime/docker/0.2.1-mysql/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM hawkbit/hawkbit-update-server:0.2.1 - -ENV MARIADB_DRIVER_VERSION=2.2.4 - -COPY KEYS . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEYS \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ - && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \ - && apk del build-dependencies - -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.1-mysql/KEYS b/hawkbit-runtime/docker/0.2.1-mysql/KEYS deleted file mode 100644 index 4c602ae045..0000000000 --- a/hawkbit-runtime/docker/0.2.1-mysql/KEYS +++ /dev/null @@ -1,40 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQENBFSTDbABCADuZ2k4NIsmhrSyAw/49GQugqPF40P0ldkTPkKDx8b6eNFtPFJbsyw9yKqU -EIS+9eFtIEMLLR4CIHMM56adZe5q5Wp7g/+rnHgTuefVWfMg42Vaxdk8lTQIN2Z3gSsj36DZ -TtO+SmxixFfxHb2YESUvgVzeWIaFBKZCV4JdumniI02RCAPuqxIHKYmhwuqQSpzIAuZQEVvM -qSwFBUOr+CSf3+YzQ/PmFqldlQOQKbSE6G2H7E1mMhRBI07uryo1gDSM42DSFcZ+eQCzCHQr -CNC+2TtBrPkmPNU7TpngtjBthjwF/qJVVX8/q+syv524E1MtO+uXwf4PvrFJ537SkfdHABEB -AAG0OE1hcmlhREIgRW50ZXJwcmlzZSBTaWduaW5nIEtleSA8c2lnbmluZy1rZXlAbWFyaWFk -Yi5jb20+iEYEEhEIAAYFAlTeJRQACgkQy8sIKhu5Q9tQ8wCfXu/gtMah1J9a+CB1RDKt2s4C -alIAn0LqQcsEib4zrHgBeMwp6Wvre/qZiQE4BBMBAgAiBQJUkw2wAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRDOGj3V48lPSbWuCACnykjC688qarR5aCJOkjQVruc+3GaM/8Mk -8sXT8GZisJyTott6o++tdjx4GLvnBZFssLDfnZwza9rS79GJAdHqshk4t6V8GqTK8OG2IHJk -XKG0xASUTWV3+oLA2Dbw4ILmgWZxncHTnmEx+x2DGUWTshfwrqBMFy0ksKjeWMnFSzOgbTRW -1Z7z3U4cm8dZWNAD6bNQbZBaXDUk/FOTFpGwXqB7DR/y6AMpJq2i+orD0gTW5yhdSsMasHpP -5YCcztONl9Ft08EggkzhwQSzdP+R0eI6uf/wnB9G2nkGQxHsXe1oc1UqOEQpdJgPhEv4lkFP -4izB1Ix/x4YjhlkXZqGziQIcBBIBCAAGBQJU3iVrAAoJEJFxGJmV5FqejVIP/0Qm+CWS+UZ9 -39wUkV/kvfbvhCiVMQmtJDWUJVWRYDXZsfxgdAs4RaKlIrvXShUbWSrGCPwLJkg+FBjXpXqy -/1Qf/TXHrlGGDTZ+SUOfU4O0+HKNqjGdQf3yZdJzoMySY0HdE7eob74ITqnZVjL/bZXsJzZi -xxkqhXZxHi4ToHJkDE75rO2kjYXpaOdg90MiS2nvJm9pexnVvLWIfsPYfkxHaJ3WV+HOZixT -MYKtgiPG6ebiYdOTdbfY8d7uHIxoaqiednBqjpMGygb+YL3SYOWi/rj6LzLs4Z8ISM2OJg01 -2DYL6bsIkHWbf0EcuSVdZ4o5l8V+Z055KI3vRwFadU/fpBHvV1EuXcQNOgKvc19KnoG2RIMQ -/aGVekwzbxqunY2syuQjTEycJPJ02c4r0+o31ge+BQl0K8gmn3F2geS+JqjKNXdJtLYzH3bw -upKKsXmacOUAzyM+ic5BtYkDWiNAxy9Az2OxunXjeFnBjVxJxqVbSbZMlziT1I8I8QHtNNzg -yhd3rmTU3w0oQiVM7XmGPeat09QW8/ift/ABN4t0RdVCTyBtdrzUsI/eIb8NOBLw0gkAgyNe -jiMb8H4WGd4CggA9TGmN/OOpDd0PWSWWR+05oU5LeJAAuWdqSUWGr8qiAXWSnv9Jg9y0SC2C -D7XV0eudrAy94uqeooeVh+x8iQIcBBIBCAAGBQJV8eBgAAoJEEHdwLQNpW8iwDIP/RDSgy1S -43q6SMmJiOyok+kqTBaGKNqouN3TV7vual8sS77vpe/o3sr9SrcAsdiFf4Rq81aJ61ZwJ5JI -0ZnhfJhSOo/3CJiLHsQ/XH1hurmjS0VRtYiZDe8lbLHhPWJsnC96LyPrg4pHCF8SH/XmUN9F -rqq3izeezh1fOsxjPwLixtzaf3yoQI6JzFq+ENzs0PB7JzYnrcO8oGrtVdRJUQIHg3B7Kq0B -c4rc4QPNFxPTxXfQiQtkTzkJHc8I956WFkcxnXxcEJXYdre3LVBnlNkQmvyT48Z5z/jZmBWf -NFqHvndFhGgPMrlgzuMjiEnvjx1jbk2dxQNC/Ugfq2PfTsng8rsjtLTaPoSV/csfCM3Thimm -Wcs1tqfMb9q2uFRG+kR9o8w+3TY5SkY611YqSWpBcAghixOaEGrcyDwBARVZDEEfzyWCqSEd -eQsUrsNYhAiVYI+ubYNKO9rtI+SZi5EtD5nwSKLNZFwDxvRX9PIbaT2vsRNzjqeMOkpjDg7S -79lMicr7idOon4dpLl411HpClV8MnuWmekAa/L9Ee52J50ti3Rx7MDgPISJi9ZykqpPrxmt1 -A+9ZkKE6VB63nTMBOpLUh0zD4yFHYjAUyDpSTH3SLNtVu3UfkLJ+Nr7AAKoV9YQgTmu3wSPR -FsnHsQksxFhCqGYdUKyfRsobs/Ns -=ovQp ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.2.1/Dockerfile b/hawkbit-runtime/docker/0.2.1/Dockerfile deleted file mode 100644 index 5b4e1175fa..0000000000 --- a/hawkbit-runtime/docker/0.2.1/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM openjdk:8u151-jre-alpine - -ENV HAWKBIT_VERSION=0.2.1 \ - HAWKBIT_HOME=/opt/hawkbit - -EXPOSE 8080 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && mkdir -p $HAWKBIT_HOME \ - && cd $HAWKBIT_HOME \ - && wget -O hawkbit-update-server.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ - && wget -O hawkbit-update-server.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ - && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar \ - && apk del build-dependencies - -VOLUME "$HAWKBIT_HOME/data" - -WORKDIR $HAWKBIT_HOME -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.1/KEY b/hawkbit-runtime/docker/0.2.1/KEY deleted file mode 100644 index 7a959f646d..0000000000 --- a/hawkbit-runtime/docker/0.2.1/KEY +++ /dev/null @@ -1,79 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQINBFflTWwBEAC9YoTvzZlCcQSrqPdovEmAlxlIKzPqE+06Pig87dcn+2PJDDnk9Rl9eDEH -CWKrds4mg7lVgzFApI73V7agHj9bqSyPWbp1GtReDvD4QKNEb4RM9XY8O1rStOTrznhfVIGc -oi9wKPTQWk5GXiqh6rawiyZnAfKm9WPZhKaxIi4m0zcTpJQ2dwbPi0hBpeEMJTyadId4Y+bB -AmH2qGKCOi2NXQDGDJ9BOkjLMVmPlgxnj8QBgZlUgRnVkYNjas/eVcXM5w6BQ884vUuSm35r -PelQOflmUAUiCGoE7UAhfrJdd5tOdWbn9bnCjv1eUyj2hJwJRRwRZjHvsvJygEg7T00Ntur3 -UN8fich29cjPGzjkilqK1NkRPZGROchn5MDhSoeUpGXEDL5bPAWHCNLqus6gMx5vNJ2IuNmW -rHSlsNy0pkWu88xtanjZjgX416nY7RPsmvZ1WRr04tegYB2CGO5aQWK1l+k6ciXWLqC23SAg -FE/2Edbzaxvc6jJi5cVGvvZAoH8J7wXCF0zFwORypNyXbNoiAQQnlW7LBJtJU6KihkuTjbDJ -1wmphLIdMoPTXLOxVVBTM7rsYa3ev9o9V9Z0dkAv364fO7zc/RpEoqM33NmNTzS8DUP/TF6J -UQftNJL+ExCreDqxlkyTgqf/+s/k1Z1kuYEKdRmk4MILVKGZvQARAQABtDFFY2xpcHNlIGhh -d2tCaXQgUHJvamVjdCA8aGF3a2JpdC1kZXZAZWNsaXBzZS5vcmc+iQEcBBABCAAGBQJX6nMW -AAoJEPqgpYKzPV/BDqEIAKAOy1JQjPccNwvZg8Y5OwW2QhB4lvq8ngzniSok/PAGdjsfVlJu -4zPgFkBcqgtAbXycOZXpMXQZBekfWslnDU7RtRAIZ6hJAuiJOL7qOOM3X03YHvq1HVWv2JK/ -g8NSoG1C2dw+GIsK2k4886QGX+a7pN7Mt0ZAbsVAaZx2Cig+iVc74+YW6UY6BiMOj1nGGSyG -9AT0pMgUWBbqvjpeKmiFzP5XVEL7e6pAS4jZAiYNp0xHPdYG/ANiq+hQAArmeaZa2hxOmygJ -CZvh6dYKBXMfRAQFBF8burVyhiJOV2Pn3kCxTSckaO63sZ+ayzBNrVu8Mpf0h2rIEGVVdWlx -KjyJARwEEAEIAAYFAlfrcXQACgkQZZoexg+SnXSfzQf7BWaH/x2yBzCmpbxpbUhI50bGvj6L -jasb6q68Q875ODwls9jve0ip0p7bcRwvbJ4Fd1OypwkxV3R/JdPlfkQwA4CoqHQpMOdN+iQ+ -aA8I86Z/dDL2yZS8e6cTdlRmIwC2RKAkNoy39t0P5UG3Zf6yiES0YaWB0zZQZwtBwNyOOPXD -1L2X/mKXT1yfLgc8YeBx+ojhr8LpzNZKA1vqyQ04YCYByMXy2FGqEaTHwbIZXFJ1IxIs956J -0SD929Nkw3m2/ZSONOLD0uMwb91A9lv9vRWU+bwp18S5j63N5NEEM6QsGOt9VgDhy01zdb46 -1e99V1IYkh863gCEHyJFOJi+RYkCHAQQAQgABgUCV+VPmAAKCRCforcpn1HlQ5VCD/9SxkSV -iV8sywK3cZm9lkYlnot33lAH/dYDf4md1mOf8vfNWTB0L9s5LOK9n6SWHdEKYd+f3OAP7ZM5 -Div30B/TmkyR4BgtMAkDOQSIR5+iEzXI2+iklEb1I+vhFVkKNOGoOaWRiDWZScWgwPBylYuj -iPjRAjKxtZuuhy5A4d6HkvdugoQ+4GdHeazkSeXLADz6XFBrQpUrTGCuNqdpE8QKkX4xmZ4L -Vvur3h/STBsJBfewuC4FhDTryFdd/vygivV7LrHzJlgTNqoK+oxL0wiietLtHvpwpS/gGcrq -a+8ccvPN+HhGCgpkeULEp8MUwp5fqoJxU57AZHUo/ER+6jmMSRz8V7M/VoZxwoGcH3o+paYw -GfxEPovaA6jadzEQomQTK3qsrx8nXflYPH39o3NYBM+MBLnsv6kndPqBb7OtBt2ZVges04zM -mbIYgpAUZgIOoCR75uU21DO2hbS7EHwd4nqY5vOfFSlMgtBcInjmXRiqDADspJv3938J/E2n -7M7ijERcQn6UmhCmdYLCLo2bAODp0mjjcftu6Ct65VLP1WRp95qr21VSDBoozwd9eL0AzAoC -SOhZPmDoeFoo3QcekEi4gxRtQvSdEZ0YteUENXmpSX+c/IKba5lpk4baC52HvhlNlmeu0DxX -VWqYF7O/9Z4hl2lQ5LHiSb2L0S1+6YkCPQQTAQgAJwUCV+VNbAIbLwUJCWYBgAULCQgHAwUV -CgkICwUWAgMBAAIeAQIXgAAKCRA4XLwcf2Z/rujfD/0Wp1uYXRsAzEcZavASh1Xe2301atbU -aRUy8UsNWO5oCvVjyyaPM4c3MT72sqsLyNXAWhi/MP63M0qr2+M0nN/91U8r98/Mbd+WlzRy -CLJYUX72Oqrfan+hZxcd7Xlu+sKHNshOlCy4114bVnrdq16LfeIAkx7GLw9/lMc9lRrvUwMI -684zhquROpuDD1aE/i/gBGgzd8cMoW+hdjFVA0zwe+6FgrWR2CMiKCJfeYWLuFiBNmFZC6l8 -BqiEqCuyQu6dFpWHhtK3fPJAEYIiNkORT8M3HSXl/Ex/w9ErweZKHiSja7KMAUWXkZi+Ayva -jMVI4jumXwgZW/7uuSc6bbv2SO4BSfMHvFtEuBSBWXi9e0urgqNOFQuKE7zokSbEStwG4+gN -E32ZuS2sllOxr41Nx/q2oKMeKePZBqoD5+3mDtRP432KWZjZjlhyez0Kh8aJ8lz5MM7Xxtzo -OyJeO4JHqbuBV82GvoLXVsYJBOUfRuBaZQcphUjamZwDZQFEvoKe6Ltur6+gsqu4UsQzs2bp -i26yaP3e1mrLc9Q5KAH7EkOr7wD3zo7jtJ21luGCBOtZ113oWJZgAwaevDC6cY/k32YgK8+q -iqMtNC7APznXyN4eVjKB18aSM7rVNdE8vlA818b7DbKXsqjH9N7VdiW2/4F8TJNq+OCVPjMf -pfM3KLkCDQRX6R/1ARAAplIU5GesaA42f8+idIEnozpd7aJKs8PuaOUUWr/7CmozpHNXpjPP -uPRflSRmFBeigp50xNfpLwYXjbjoVaiqdPKp6rxko0kh6NcG+pXYvCZOvWaM3e04xppREeiF -UNq8XctterVqWKC5zOgE1wY0346BgWtJvcYL9px71w2EE0bsZ/gwuphOYRblLtbmsKLwheMQ -JO2wfusPsAEGDdoaTRenEmosi/DRWt+oxodZSWygETk8fPESqcvmnjhPpVvCHksdIWEqUBXy -rg6NkkyIjLdMqeuBp/IrUN1XGBOrUgdVNpCNuiMN1Ai+6L9g364fLP7xYB84kLK+QSO03Bpv -j+D5Ca2DRweTmTaCQzaOeR2KW9kgf2tbLJbIoM2OiXLcfGN5bPvZVc2ODverOCRDiVwcVkd+ -sfbG3sUkyV+1NSYTJYTRnaNjsQmNGBfI0mI7v0zEHVt+X0tuJeP5QcMJ1lvLqBiZgZQDFVg4 -vtchDLFTv2JlLfsbyG+U2f2iLA3mauyFRS+x1ZFeIENsXwSqLn1WXvslnkV8cTs4hTFb1Skj -zC89XbjY2PUJMg2XWLeWjvv6pVGvdRVlPuujbou93SMfPSdYPqOrX4eX42I66GXuXMczbu9H -F8kk7OpyP9cYo8LpiHjuxHm/VMFLckagluXwZCl6uiIRB+IJJmd+2jcAEQEAAYkERAQYAQgA -DwUCV+kf9QIbAgUJCWYBgAIpCRA4XLwcf2Z/rsFdIAQZAQgABgUCV+kf9QAKCRBjMbgT6Sl8 -4NSbD/9ueOFntw+rs2q7hAGOq2LP3D/d7SuU+j8vUcszJK2ETQlKX9IcQs3c+T4AbpQ4O5Ea -EvvYEAVmPjosk9zn7sxiWrzvDbvfhQK6hR6zbBK2LB7yTkzBh3oT8WghbCqeTDqJMl47PUv5 -yUVsX4RHmbgo7qymRGiPJ8a+5QPOmtmdoyaEv0hGvszya4aTKexLM4fU+k+e8kupY9fTICE7 -S7zUpX7hpFYC4d/uk3KUkCvebox2C4UomT2kV518/Pnj/6wpWQ3GHnqIurMPOW097VsP3epl -jutNwXM3sH6rbgiiZqdQFb3bq1Da4fpNqnH6Rdm7fSjjV2R36qDrPQz/AfZC2fouq2Xbse6M -RKR48peb80cvtGqhc2J7FHWfEu8da/26Gxq07SOod9svR8eBcJAnlCd3Hca0T2qmaM52WvC+ -Mjxsjgg6yGh0PenjsNQM2mdhvKUflqbLluY4E2QPHVJZlT3Bo5LekM91ZZAgd4F3xBE25/WL -Akg2/rsCiulAfaEXAPQkqCaB7ajd9dvJXcq5qvWSvSgW5vL/nnyecE5ktf8todaMhMz83gpt -eXtR8Ms7401d2Qwt28NifXkgEMMNfytXg/0TO6F0uRGi67SoAeadUjug2JSr7LBmeQHyOvLR -q+0iO1m3f3pSSduqBjKWUFnJShED8FafaRUrE1+HWN2lD/0Sci1X33CrTXNSQCzdTaD3R/SJ -B+BSspEQNV/JqAPjJD9ZK3dwDm5upmrjpFNjSVvcQJoy0J1rW2q2E8y8ECuxErUWQqyFv/Co -y39WpwgWam19ykP3yNiU9UHGb58DhuMRwLOYF7o5Iwg2nbiYtHO5jSmC3PPpYz3TLvA/kSTK -1T1m6ac2dA6UMLn3t3Cohv50wpr41bxLz04ig/dEmrdP72HRpA5oNoXAXCaCeeed5R1DfxgW -RL2fP+GL6ZftTplw3AL2trJa+0zLFHvDo+M4c1brM2x0HYEoX+qSpFMxtixgV0D5Uf7RUMkN -eYPb4SZRc6wDHIt7Wqp/qlUozC94DKbFUrK4UnHyK4+HVlSQJGevqm+Y+QoqIBcnhOEN0Bzo -01aVHIZFxzk4R2bppFEDiFEw1zL2DAPj/xX7Zqrjsg/qdVu9bUklBxir6QSOwZGZMGYCuBWM -uJU3IY7Xzx/6Anm5oqbXLVLwVFwS8tED+/XYjPUo1ifLGVx96THuQrNBMhpwNE/9Qd4zbjnE -7f6foXLgeB/l2h65zrI6O1RdEAUpA8Tuhgy0PwNc/1mviaOkYx9qFlhyjruTd72TV4va+5Qb -L7wnh417OQNbpWUqb5HvN5BruDFQOBztFupi/7LHWnSX4XVO777SYzlf1a7DdJu45cql44d2 -LrdPYOGtAA== -=a0Oj ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.2.2-mysql/Dockerfile b/hawkbit-runtime/docker/0.2.2-mysql/Dockerfile deleted file mode 100644 index e6cf91dc03..0000000000 --- a/hawkbit-runtime/docker/0.2.2-mysql/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM hawkbit/hawkbit-update-server:0.2.2 - -ENV MARIADB_DRIVER_VERSION=2.2.6 - -COPY KEYS . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEYS \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ - && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \ - && apk del build-dependencies - -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.2-mysql/KEYS b/hawkbit-runtime/docker/0.2.2-mysql/KEYS deleted file mode 100644 index 4c602ae045..0000000000 --- a/hawkbit-runtime/docker/0.2.2-mysql/KEYS +++ /dev/null @@ -1,40 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQENBFSTDbABCADuZ2k4NIsmhrSyAw/49GQugqPF40P0ldkTPkKDx8b6eNFtPFJbsyw9yKqU -EIS+9eFtIEMLLR4CIHMM56adZe5q5Wp7g/+rnHgTuefVWfMg42Vaxdk8lTQIN2Z3gSsj36DZ -TtO+SmxixFfxHb2YESUvgVzeWIaFBKZCV4JdumniI02RCAPuqxIHKYmhwuqQSpzIAuZQEVvM -qSwFBUOr+CSf3+YzQ/PmFqldlQOQKbSE6G2H7E1mMhRBI07uryo1gDSM42DSFcZ+eQCzCHQr -CNC+2TtBrPkmPNU7TpngtjBthjwF/qJVVX8/q+syv524E1MtO+uXwf4PvrFJ537SkfdHABEB -AAG0OE1hcmlhREIgRW50ZXJwcmlzZSBTaWduaW5nIEtleSA8c2lnbmluZy1rZXlAbWFyaWFk -Yi5jb20+iEYEEhEIAAYFAlTeJRQACgkQy8sIKhu5Q9tQ8wCfXu/gtMah1J9a+CB1RDKt2s4C -alIAn0LqQcsEib4zrHgBeMwp6Wvre/qZiQE4BBMBAgAiBQJUkw2wAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRDOGj3V48lPSbWuCACnykjC688qarR5aCJOkjQVruc+3GaM/8Mk -8sXT8GZisJyTott6o++tdjx4GLvnBZFssLDfnZwza9rS79GJAdHqshk4t6V8GqTK8OG2IHJk -XKG0xASUTWV3+oLA2Dbw4ILmgWZxncHTnmEx+x2DGUWTshfwrqBMFy0ksKjeWMnFSzOgbTRW -1Z7z3U4cm8dZWNAD6bNQbZBaXDUk/FOTFpGwXqB7DR/y6AMpJq2i+orD0gTW5yhdSsMasHpP -5YCcztONl9Ft08EggkzhwQSzdP+R0eI6uf/wnB9G2nkGQxHsXe1oc1UqOEQpdJgPhEv4lkFP -4izB1Ix/x4YjhlkXZqGziQIcBBIBCAAGBQJU3iVrAAoJEJFxGJmV5FqejVIP/0Qm+CWS+UZ9 -39wUkV/kvfbvhCiVMQmtJDWUJVWRYDXZsfxgdAs4RaKlIrvXShUbWSrGCPwLJkg+FBjXpXqy -/1Qf/TXHrlGGDTZ+SUOfU4O0+HKNqjGdQf3yZdJzoMySY0HdE7eob74ITqnZVjL/bZXsJzZi -xxkqhXZxHi4ToHJkDE75rO2kjYXpaOdg90MiS2nvJm9pexnVvLWIfsPYfkxHaJ3WV+HOZixT -MYKtgiPG6ebiYdOTdbfY8d7uHIxoaqiednBqjpMGygb+YL3SYOWi/rj6LzLs4Z8ISM2OJg01 -2DYL6bsIkHWbf0EcuSVdZ4o5l8V+Z055KI3vRwFadU/fpBHvV1EuXcQNOgKvc19KnoG2RIMQ -/aGVekwzbxqunY2syuQjTEycJPJ02c4r0+o31ge+BQl0K8gmn3F2geS+JqjKNXdJtLYzH3bw -upKKsXmacOUAzyM+ic5BtYkDWiNAxy9Az2OxunXjeFnBjVxJxqVbSbZMlziT1I8I8QHtNNzg -yhd3rmTU3w0oQiVM7XmGPeat09QW8/ift/ABN4t0RdVCTyBtdrzUsI/eIb8NOBLw0gkAgyNe -jiMb8H4WGd4CggA9TGmN/OOpDd0PWSWWR+05oU5LeJAAuWdqSUWGr8qiAXWSnv9Jg9y0SC2C -D7XV0eudrAy94uqeooeVh+x8iQIcBBIBCAAGBQJV8eBgAAoJEEHdwLQNpW8iwDIP/RDSgy1S -43q6SMmJiOyok+kqTBaGKNqouN3TV7vual8sS77vpe/o3sr9SrcAsdiFf4Rq81aJ61ZwJ5JI -0ZnhfJhSOo/3CJiLHsQ/XH1hurmjS0VRtYiZDe8lbLHhPWJsnC96LyPrg4pHCF8SH/XmUN9F -rqq3izeezh1fOsxjPwLixtzaf3yoQI6JzFq+ENzs0PB7JzYnrcO8oGrtVdRJUQIHg3B7Kq0B -c4rc4QPNFxPTxXfQiQtkTzkJHc8I956WFkcxnXxcEJXYdre3LVBnlNkQmvyT48Z5z/jZmBWf -NFqHvndFhGgPMrlgzuMjiEnvjx1jbk2dxQNC/Ugfq2PfTsng8rsjtLTaPoSV/csfCM3Thimm -Wcs1tqfMb9q2uFRG+kR9o8w+3TY5SkY611YqSWpBcAghixOaEGrcyDwBARVZDEEfzyWCqSEd -eQsUrsNYhAiVYI+ubYNKO9rtI+SZi5EtD5nwSKLNZFwDxvRX9PIbaT2vsRNzjqeMOkpjDg7S -79lMicr7idOon4dpLl411HpClV8MnuWmekAa/L9Ee52J50ti3Rx7MDgPISJi9ZykqpPrxmt1 -A+9ZkKE6VB63nTMBOpLUh0zD4yFHYjAUyDpSTH3SLNtVu3UfkLJ+Nr7AAKoV9YQgTmu3wSPR -FsnHsQksxFhCqGYdUKyfRsobs/Ns -=ovQp ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.2.2/Dockerfile b/hawkbit-runtime/docker/0.2.2/Dockerfile deleted file mode 100644 index 295f479985..0000000000 --- a/hawkbit-runtime/docker/0.2.2/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM openjdk:8u171-jre-alpine - -ENV HAWKBIT_VERSION=0.2.2 \ - HAWKBIT_HOME=/opt/hawkbit - -EXPOSE 8080 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && mkdir -p $HAWKBIT_HOME \ - && cd $HAWKBIT_HOME \ - && wget -O hawkbit-update-server.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ - && wget -O hawkbit-update-server.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ - && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar \ - && apk del build-dependencies - -VOLUME "$HAWKBIT_HOME/data" - -WORKDIR $HAWKBIT_HOME -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.2/KEY b/hawkbit-runtime/docker/0.2.2/KEY deleted file mode 100644 index 7a959f646d..0000000000 --- a/hawkbit-runtime/docker/0.2.2/KEY +++ /dev/null @@ -1,79 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQINBFflTWwBEAC9YoTvzZlCcQSrqPdovEmAlxlIKzPqE+06Pig87dcn+2PJDDnk9Rl9eDEH -CWKrds4mg7lVgzFApI73V7agHj9bqSyPWbp1GtReDvD4QKNEb4RM9XY8O1rStOTrznhfVIGc -oi9wKPTQWk5GXiqh6rawiyZnAfKm9WPZhKaxIi4m0zcTpJQ2dwbPi0hBpeEMJTyadId4Y+bB -AmH2qGKCOi2NXQDGDJ9BOkjLMVmPlgxnj8QBgZlUgRnVkYNjas/eVcXM5w6BQ884vUuSm35r -PelQOflmUAUiCGoE7UAhfrJdd5tOdWbn9bnCjv1eUyj2hJwJRRwRZjHvsvJygEg7T00Ntur3 -UN8fich29cjPGzjkilqK1NkRPZGROchn5MDhSoeUpGXEDL5bPAWHCNLqus6gMx5vNJ2IuNmW -rHSlsNy0pkWu88xtanjZjgX416nY7RPsmvZ1WRr04tegYB2CGO5aQWK1l+k6ciXWLqC23SAg -FE/2Edbzaxvc6jJi5cVGvvZAoH8J7wXCF0zFwORypNyXbNoiAQQnlW7LBJtJU6KihkuTjbDJ -1wmphLIdMoPTXLOxVVBTM7rsYa3ev9o9V9Z0dkAv364fO7zc/RpEoqM33NmNTzS8DUP/TF6J -UQftNJL+ExCreDqxlkyTgqf/+s/k1Z1kuYEKdRmk4MILVKGZvQARAQABtDFFY2xpcHNlIGhh -d2tCaXQgUHJvamVjdCA8aGF3a2JpdC1kZXZAZWNsaXBzZS5vcmc+iQEcBBABCAAGBQJX6nMW -AAoJEPqgpYKzPV/BDqEIAKAOy1JQjPccNwvZg8Y5OwW2QhB4lvq8ngzniSok/PAGdjsfVlJu -4zPgFkBcqgtAbXycOZXpMXQZBekfWslnDU7RtRAIZ6hJAuiJOL7qOOM3X03YHvq1HVWv2JK/ -g8NSoG1C2dw+GIsK2k4886QGX+a7pN7Mt0ZAbsVAaZx2Cig+iVc74+YW6UY6BiMOj1nGGSyG -9AT0pMgUWBbqvjpeKmiFzP5XVEL7e6pAS4jZAiYNp0xHPdYG/ANiq+hQAArmeaZa2hxOmygJ -CZvh6dYKBXMfRAQFBF8burVyhiJOV2Pn3kCxTSckaO63sZ+ayzBNrVu8Mpf0h2rIEGVVdWlx -KjyJARwEEAEIAAYFAlfrcXQACgkQZZoexg+SnXSfzQf7BWaH/x2yBzCmpbxpbUhI50bGvj6L -jasb6q68Q875ODwls9jve0ip0p7bcRwvbJ4Fd1OypwkxV3R/JdPlfkQwA4CoqHQpMOdN+iQ+ -aA8I86Z/dDL2yZS8e6cTdlRmIwC2RKAkNoy39t0P5UG3Zf6yiES0YaWB0zZQZwtBwNyOOPXD -1L2X/mKXT1yfLgc8YeBx+ojhr8LpzNZKA1vqyQ04YCYByMXy2FGqEaTHwbIZXFJ1IxIs956J -0SD929Nkw3m2/ZSONOLD0uMwb91A9lv9vRWU+bwp18S5j63N5NEEM6QsGOt9VgDhy01zdb46 -1e99V1IYkh863gCEHyJFOJi+RYkCHAQQAQgABgUCV+VPmAAKCRCforcpn1HlQ5VCD/9SxkSV -iV8sywK3cZm9lkYlnot33lAH/dYDf4md1mOf8vfNWTB0L9s5LOK9n6SWHdEKYd+f3OAP7ZM5 -Div30B/TmkyR4BgtMAkDOQSIR5+iEzXI2+iklEb1I+vhFVkKNOGoOaWRiDWZScWgwPBylYuj -iPjRAjKxtZuuhy5A4d6HkvdugoQ+4GdHeazkSeXLADz6XFBrQpUrTGCuNqdpE8QKkX4xmZ4L -Vvur3h/STBsJBfewuC4FhDTryFdd/vygivV7LrHzJlgTNqoK+oxL0wiietLtHvpwpS/gGcrq -a+8ccvPN+HhGCgpkeULEp8MUwp5fqoJxU57AZHUo/ER+6jmMSRz8V7M/VoZxwoGcH3o+paYw -GfxEPovaA6jadzEQomQTK3qsrx8nXflYPH39o3NYBM+MBLnsv6kndPqBb7OtBt2ZVges04zM -mbIYgpAUZgIOoCR75uU21DO2hbS7EHwd4nqY5vOfFSlMgtBcInjmXRiqDADspJv3938J/E2n -7M7ijERcQn6UmhCmdYLCLo2bAODp0mjjcftu6Ct65VLP1WRp95qr21VSDBoozwd9eL0AzAoC -SOhZPmDoeFoo3QcekEi4gxRtQvSdEZ0YteUENXmpSX+c/IKba5lpk4baC52HvhlNlmeu0DxX -VWqYF7O/9Z4hl2lQ5LHiSb2L0S1+6YkCPQQTAQgAJwUCV+VNbAIbLwUJCWYBgAULCQgHAwUV -CgkICwUWAgMBAAIeAQIXgAAKCRA4XLwcf2Z/rujfD/0Wp1uYXRsAzEcZavASh1Xe2301atbU -aRUy8UsNWO5oCvVjyyaPM4c3MT72sqsLyNXAWhi/MP63M0qr2+M0nN/91U8r98/Mbd+WlzRy -CLJYUX72Oqrfan+hZxcd7Xlu+sKHNshOlCy4114bVnrdq16LfeIAkx7GLw9/lMc9lRrvUwMI -684zhquROpuDD1aE/i/gBGgzd8cMoW+hdjFVA0zwe+6FgrWR2CMiKCJfeYWLuFiBNmFZC6l8 -BqiEqCuyQu6dFpWHhtK3fPJAEYIiNkORT8M3HSXl/Ex/w9ErweZKHiSja7KMAUWXkZi+Ayva -jMVI4jumXwgZW/7uuSc6bbv2SO4BSfMHvFtEuBSBWXi9e0urgqNOFQuKE7zokSbEStwG4+gN -E32ZuS2sllOxr41Nx/q2oKMeKePZBqoD5+3mDtRP432KWZjZjlhyez0Kh8aJ8lz5MM7Xxtzo -OyJeO4JHqbuBV82GvoLXVsYJBOUfRuBaZQcphUjamZwDZQFEvoKe6Ltur6+gsqu4UsQzs2bp -i26yaP3e1mrLc9Q5KAH7EkOr7wD3zo7jtJ21luGCBOtZ113oWJZgAwaevDC6cY/k32YgK8+q -iqMtNC7APznXyN4eVjKB18aSM7rVNdE8vlA818b7DbKXsqjH9N7VdiW2/4F8TJNq+OCVPjMf -pfM3KLkCDQRX6R/1ARAAplIU5GesaA42f8+idIEnozpd7aJKs8PuaOUUWr/7CmozpHNXpjPP -uPRflSRmFBeigp50xNfpLwYXjbjoVaiqdPKp6rxko0kh6NcG+pXYvCZOvWaM3e04xppREeiF -UNq8XctterVqWKC5zOgE1wY0346BgWtJvcYL9px71w2EE0bsZ/gwuphOYRblLtbmsKLwheMQ -JO2wfusPsAEGDdoaTRenEmosi/DRWt+oxodZSWygETk8fPESqcvmnjhPpVvCHksdIWEqUBXy -rg6NkkyIjLdMqeuBp/IrUN1XGBOrUgdVNpCNuiMN1Ai+6L9g364fLP7xYB84kLK+QSO03Bpv -j+D5Ca2DRweTmTaCQzaOeR2KW9kgf2tbLJbIoM2OiXLcfGN5bPvZVc2ODverOCRDiVwcVkd+ -sfbG3sUkyV+1NSYTJYTRnaNjsQmNGBfI0mI7v0zEHVt+X0tuJeP5QcMJ1lvLqBiZgZQDFVg4 -vtchDLFTv2JlLfsbyG+U2f2iLA3mauyFRS+x1ZFeIENsXwSqLn1WXvslnkV8cTs4hTFb1Skj -zC89XbjY2PUJMg2XWLeWjvv6pVGvdRVlPuujbou93SMfPSdYPqOrX4eX42I66GXuXMczbu9H -F8kk7OpyP9cYo8LpiHjuxHm/VMFLckagluXwZCl6uiIRB+IJJmd+2jcAEQEAAYkERAQYAQgA -DwUCV+kf9QIbAgUJCWYBgAIpCRA4XLwcf2Z/rsFdIAQZAQgABgUCV+kf9QAKCRBjMbgT6Sl8 -4NSbD/9ueOFntw+rs2q7hAGOq2LP3D/d7SuU+j8vUcszJK2ETQlKX9IcQs3c+T4AbpQ4O5Ea -EvvYEAVmPjosk9zn7sxiWrzvDbvfhQK6hR6zbBK2LB7yTkzBh3oT8WghbCqeTDqJMl47PUv5 -yUVsX4RHmbgo7qymRGiPJ8a+5QPOmtmdoyaEv0hGvszya4aTKexLM4fU+k+e8kupY9fTICE7 -S7zUpX7hpFYC4d/uk3KUkCvebox2C4UomT2kV518/Pnj/6wpWQ3GHnqIurMPOW097VsP3epl -jutNwXM3sH6rbgiiZqdQFb3bq1Da4fpNqnH6Rdm7fSjjV2R36qDrPQz/AfZC2fouq2Xbse6M -RKR48peb80cvtGqhc2J7FHWfEu8da/26Gxq07SOod9svR8eBcJAnlCd3Hca0T2qmaM52WvC+ -Mjxsjgg6yGh0PenjsNQM2mdhvKUflqbLluY4E2QPHVJZlT3Bo5LekM91ZZAgd4F3xBE25/WL -Akg2/rsCiulAfaEXAPQkqCaB7ajd9dvJXcq5qvWSvSgW5vL/nnyecE5ktf8todaMhMz83gpt -eXtR8Ms7401d2Qwt28NifXkgEMMNfytXg/0TO6F0uRGi67SoAeadUjug2JSr7LBmeQHyOvLR -q+0iO1m3f3pSSduqBjKWUFnJShED8FafaRUrE1+HWN2lD/0Sci1X33CrTXNSQCzdTaD3R/SJ -B+BSspEQNV/JqAPjJD9ZK3dwDm5upmrjpFNjSVvcQJoy0J1rW2q2E8y8ECuxErUWQqyFv/Co -y39WpwgWam19ykP3yNiU9UHGb58DhuMRwLOYF7o5Iwg2nbiYtHO5jSmC3PPpYz3TLvA/kSTK -1T1m6ac2dA6UMLn3t3Cohv50wpr41bxLz04ig/dEmrdP72HRpA5oNoXAXCaCeeed5R1DfxgW -RL2fP+GL6ZftTplw3AL2trJa+0zLFHvDo+M4c1brM2x0HYEoX+qSpFMxtixgV0D5Uf7RUMkN -eYPb4SZRc6wDHIt7Wqp/qlUozC94DKbFUrK4UnHyK4+HVlSQJGevqm+Y+QoqIBcnhOEN0Bzo -01aVHIZFxzk4R2bppFEDiFEw1zL2DAPj/xX7Zqrjsg/qdVu9bUklBxir6QSOwZGZMGYCuBWM -uJU3IY7Xzx/6Anm5oqbXLVLwVFwS8tED+/XYjPUo1ifLGVx96THuQrNBMhpwNE/9Qd4zbjnE -7f6foXLgeB/l2h65zrI6O1RdEAUpA8Tuhgy0PwNc/1mviaOkYx9qFlhyjruTd72TV4va+5Qb -L7wnh417OQNbpWUqb5HvN5BruDFQOBztFupi/7LHWnSX4XVO777SYzlf1a7DdJu45cql44d2 -LrdPYOGtAA== -=a0Oj ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.2.3-mysql/Dockerfile b/hawkbit-runtime/docker/0.2.3-mysql/Dockerfile deleted file mode 100644 index 6c29bf668d..0000000000 --- a/hawkbit-runtime/docker/0.2.3-mysql/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM hawkbit/hawkbit-update-server:0.2.3 - -ENV MARIADB_DRIVER_VERSION=2.2.6 - -COPY KEYS . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEYS \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ - && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \ - && apk del build-dependencies - -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.3-mysql/KEYS b/hawkbit-runtime/docker/0.2.3-mysql/KEYS deleted file mode 100644 index 4c602ae045..0000000000 --- a/hawkbit-runtime/docker/0.2.3-mysql/KEYS +++ /dev/null @@ -1,40 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQENBFSTDbABCADuZ2k4NIsmhrSyAw/49GQugqPF40P0ldkTPkKDx8b6eNFtPFJbsyw9yKqU -EIS+9eFtIEMLLR4CIHMM56adZe5q5Wp7g/+rnHgTuefVWfMg42Vaxdk8lTQIN2Z3gSsj36DZ -TtO+SmxixFfxHb2YESUvgVzeWIaFBKZCV4JdumniI02RCAPuqxIHKYmhwuqQSpzIAuZQEVvM -qSwFBUOr+CSf3+YzQ/PmFqldlQOQKbSE6G2H7E1mMhRBI07uryo1gDSM42DSFcZ+eQCzCHQr -CNC+2TtBrPkmPNU7TpngtjBthjwF/qJVVX8/q+syv524E1MtO+uXwf4PvrFJ537SkfdHABEB -AAG0OE1hcmlhREIgRW50ZXJwcmlzZSBTaWduaW5nIEtleSA8c2lnbmluZy1rZXlAbWFyaWFk -Yi5jb20+iEYEEhEIAAYFAlTeJRQACgkQy8sIKhu5Q9tQ8wCfXu/gtMah1J9a+CB1RDKt2s4C -alIAn0LqQcsEib4zrHgBeMwp6Wvre/qZiQE4BBMBAgAiBQJUkw2wAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRDOGj3V48lPSbWuCACnykjC688qarR5aCJOkjQVruc+3GaM/8Mk -8sXT8GZisJyTott6o++tdjx4GLvnBZFssLDfnZwza9rS79GJAdHqshk4t6V8GqTK8OG2IHJk -XKG0xASUTWV3+oLA2Dbw4ILmgWZxncHTnmEx+x2DGUWTshfwrqBMFy0ksKjeWMnFSzOgbTRW -1Z7z3U4cm8dZWNAD6bNQbZBaXDUk/FOTFpGwXqB7DR/y6AMpJq2i+orD0gTW5yhdSsMasHpP -5YCcztONl9Ft08EggkzhwQSzdP+R0eI6uf/wnB9G2nkGQxHsXe1oc1UqOEQpdJgPhEv4lkFP -4izB1Ix/x4YjhlkXZqGziQIcBBIBCAAGBQJU3iVrAAoJEJFxGJmV5FqejVIP/0Qm+CWS+UZ9 -39wUkV/kvfbvhCiVMQmtJDWUJVWRYDXZsfxgdAs4RaKlIrvXShUbWSrGCPwLJkg+FBjXpXqy -/1Qf/TXHrlGGDTZ+SUOfU4O0+HKNqjGdQf3yZdJzoMySY0HdE7eob74ITqnZVjL/bZXsJzZi -xxkqhXZxHi4ToHJkDE75rO2kjYXpaOdg90MiS2nvJm9pexnVvLWIfsPYfkxHaJ3WV+HOZixT -MYKtgiPG6ebiYdOTdbfY8d7uHIxoaqiednBqjpMGygb+YL3SYOWi/rj6LzLs4Z8ISM2OJg01 -2DYL6bsIkHWbf0EcuSVdZ4o5l8V+Z055KI3vRwFadU/fpBHvV1EuXcQNOgKvc19KnoG2RIMQ -/aGVekwzbxqunY2syuQjTEycJPJ02c4r0+o31ge+BQl0K8gmn3F2geS+JqjKNXdJtLYzH3bw -upKKsXmacOUAzyM+ic5BtYkDWiNAxy9Az2OxunXjeFnBjVxJxqVbSbZMlziT1I8I8QHtNNzg -yhd3rmTU3w0oQiVM7XmGPeat09QW8/ift/ABN4t0RdVCTyBtdrzUsI/eIb8NOBLw0gkAgyNe -jiMb8H4WGd4CggA9TGmN/OOpDd0PWSWWR+05oU5LeJAAuWdqSUWGr8qiAXWSnv9Jg9y0SC2C -D7XV0eudrAy94uqeooeVh+x8iQIcBBIBCAAGBQJV8eBgAAoJEEHdwLQNpW8iwDIP/RDSgy1S -43q6SMmJiOyok+kqTBaGKNqouN3TV7vual8sS77vpe/o3sr9SrcAsdiFf4Rq81aJ61ZwJ5JI -0ZnhfJhSOo/3CJiLHsQ/XH1hurmjS0VRtYiZDe8lbLHhPWJsnC96LyPrg4pHCF8SH/XmUN9F -rqq3izeezh1fOsxjPwLixtzaf3yoQI6JzFq+ENzs0PB7JzYnrcO8oGrtVdRJUQIHg3B7Kq0B -c4rc4QPNFxPTxXfQiQtkTzkJHc8I956WFkcxnXxcEJXYdre3LVBnlNkQmvyT48Z5z/jZmBWf -NFqHvndFhGgPMrlgzuMjiEnvjx1jbk2dxQNC/Ugfq2PfTsng8rsjtLTaPoSV/csfCM3Thimm -Wcs1tqfMb9q2uFRG+kR9o8w+3TY5SkY611YqSWpBcAghixOaEGrcyDwBARVZDEEfzyWCqSEd -eQsUrsNYhAiVYI+ubYNKO9rtI+SZi5EtD5nwSKLNZFwDxvRX9PIbaT2vsRNzjqeMOkpjDg7S -79lMicr7idOon4dpLl411HpClV8MnuWmekAa/L9Ee52J50ti3Rx7MDgPISJi9ZykqpPrxmt1 -A+9ZkKE6VB63nTMBOpLUh0zD4yFHYjAUyDpSTH3SLNtVu3UfkLJ+Nr7AAKoV9YQgTmu3wSPR -FsnHsQksxFhCqGYdUKyfRsobs/Ns -=ovQp ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.2.3/Dockerfile b/hawkbit-runtime/docker/0.2.3/Dockerfile deleted file mode 100644 index 22ad6e33aa..0000000000 --- a/hawkbit-runtime/docker/0.2.3/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM openjdk:8u171-jre-alpine - -ENV HAWKBIT_VERSION=0.2.3 \ - HAWKBIT_HOME=/opt/hawkbit - -EXPOSE 8080 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && mkdir -p $HAWKBIT_HOME \ - && cd $HAWKBIT_HOME \ - && wget -O hawkbit-update-server.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ - && wget -O hawkbit-update-server.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ - && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar \ - && apk del build-dependencies - -VOLUME "$HAWKBIT_HOME/data" - -WORKDIR $HAWKBIT_HOME -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.3/KEY b/hawkbit-runtime/docker/0.2.3/KEY deleted file mode 100644 index 7a959f646d..0000000000 --- a/hawkbit-runtime/docker/0.2.3/KEY +++ /dev/null @@ -1,79 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQINBFflTWwBEAC9YoTvzZlCcQSrqPdovEmAlxlIKzPqE+06Pig87dcn+2PJDDnk9Rl9eDEH -CWKrds4mg7lVgzFApI73V7agHj9bqSyPWbp1GtReDvD4QKNEb4RM9XY8O1rStOTrznhfVIGc -oi9wKPTQWk5GXiqh6rawiyZnAfKm9WPZhKaxIi4m0zcTpJQ2dwbPi0hBpeEMJTyadId4Y+bB -AmH2qGKCOi2NXQDGDJ9BOkjLMVmPlgxnj8QBgZlUgRnVkYNjas/eVcXM5w6BQ884vUuSm35r -PelQOflmUAUiCGoE7UAhfrJdd5tOdWbn9bnCjv1eUyj2hJwJRRwRZjHvsvJygEg7T00Ntur3 -UN8fich29cjPGzjkilqK1NkRPZGROchn5MDhSoeUpGXEDL5bPAWHCNLqus6gMx5vNJ2IuNmW -rHSlsNy0pkWu88xtanjZjgX416nY7RPsmvZ1WRr04tegYB2CGO5aQWK1l+k6ciXWLqC23SAg -FE/2Edbzaxvc6jJi5cVGvvZAoH8J7wXCF0zFwORypNyXbNoiAQQnlW7LBJtJU6KihkuTjbDJ -1wmphLIdMoPTXLOxVVBTM7rsYa3ev9o9V9Z0dkAv364fO7zc/RpEoqM33NmNTzS8DUP/TF6J -UQftNJL+ExCreDqxlkyTgqf/+s/k1Z1kuYEKdRmk4MILVKGZvQARAQABtDFFY2xpcHNlIGhh -d2tCaXQgUHJvamVjdCA8aGF3a2JpdC1kZXZAZWNsaXBzZS5vcmc+iQEcBBABCAAGBQJX6nMW -AAoJEPqgpYKzPV/BDqEIAKAOy1JQjPccNwvZg8Y5OwW2QhB4lvq8ngzniSok/PAGdjsfVlJu -4zPgFkBcqgtAbXycOZXpMXQZBekfWslnDU7RtRAIZ6hJAuiJOL7qOOM3X03YHvq1HVWv2JK/ -g8NSoG1C2dw+GIsK2k4886QGX+a7pN7Mt0ZAbsVAaZx2Cig+iVc74+YW6UY6BiMOj1nGGSyG -9AT0pMgUWBbqvjpeKmiFzP5XVEL7e6pAS4jZAiYNp0xHPdYG/ANiq+hQAArmeaZa2hxOmygJ -CZvh6dYKBXMfRAQFBF8burVyhiJOV2Pn3kCxTSckaO63sZ+ayzBNrVu8Mpf0h2rIEGVVdWlx -KjyJARwEEAEIAAYFAlfrcXQACgkQZZoexg+SnXSfzQf7BWaH/x2yBzCmpbxpbUhI50bGvj6L -jasb6q68Q875ODwls9jve0ip0p7bcRwvbJ4Fd1OypwkxV3R/JdPlfkQwA4CoqHQpMOdN+iQ+ -aA8I86Z/dDL2yZS8e6cTdlRmIwC2RKAkNoy39t0P5UG3Zf6yiES0YaWB0zZQZwtBwNyOOPXD -1L2X/mKXT1yfLgc8YeBx+ojhr8LpzNZKA1vqyQ04YCYByMXy2FGqEaTHwbIZXFJ1IxIs956J -0SD929Nkw3m2/ZSONOLD0uMwb91A9lv9vRWU+bwp18S5j63N5NEEM6QsGOt9VgDhy01zdb46 -1e99V1IYkh863gCEHyJFOJi+RYkCHAQQAQgABgUCV+VPmAAKCRCforcpn1HlQ5VCD/9SxkSV -iV8sywK3cZm9lkYlnot33lAH/dYDf4md1mOf8vfNWTB0L9s5LOK9n6SWHdEKYd+f3OAP7ZM5 -Div30B/TmkyR4BgtMAkDOQSIR5+iEzXI2+iklEb1I+vhFVkKNOGoOaWRiDWZScWgwPBylYuj -iPjRAjKxtZuuhy5A4d6HkvdugoQ+4GdHeazkSeXLADz6XFBrQpUrTGCuNqdpE8QKkX4xmZ4L -Vvur3h/STBsJBfewuC4FhDTryFdd/vygivV7LrHzJlgTNqoK+oxL0wiietLtHvpwpS/gGcrq -a+8ccvPN+HhGCgpkeULEp8MUwp5fqoJxU57AZHUo/ER+6jmMSRz8V7M/VoZxwoGcH3o+paYw -GfxEPovaA6jadzEQomQTK3qsrx8nXflYPH39o3NYBM+MBLnsv6kndPqBb7OtBt2ZVges04zM -mbIYgpAUZgIOoCR75uU21DO2hbS7EHwd4nqY5vOfFSlMgtBcInjmXRiqDADspJv3938J/E2n -7M7ijERcQn6UmhCmdYLCLo2bAODp0mjjcftu6Ct65VLP1WRp95qr21VSDBoozwd9eL0AzAoC -SOhZPmDoeFoo3QcekEi4gxRtQvSdEZ0YteUENXmpSX+c/IKba5lpk4baC52HvhlNlmeu0DxX -VWqYF7O/9Z4hl2lQ5LHiSb2L0S1+6YkCPQQTAQgAJwUCV+VNbAIbLwUJCWYBgAULCQgHAwUV -CgkICwUWAgMBAAIeAQIXgAAKCRA4XLwcf2Z/rujfD/0Wp1uYXRsAzEcZavASh1Xe2301atbU -aRUy8UsNWO5oCvVjyyaPM4c3MT72sqsLyNXAWhi/MP63M0qr2+M0nN/91U8r98/Mbd+WlzRy -CLJYUX72Oqrfan+hZxcd7Xlu+sKHNshOlCy4114bVnrdq16LfeIAkx7GLw9/lMc9lRrvUwMI -684zhquROpuDD1aE/i/gBGgzd8cMoW+hdjFVA0zwe+6FgrWR2CMiKCJfeYWLuFiBNmFZC6l8 -BqiEqCuyQu6dFpWHhtK3fPJAEYIiNkORT8M3HSXl/Ex/w9ErweZKHiSja7KMAUWXkZi+Ayva -jMVI4jumXwgZW/7uuSc6bbv2SO4BSfMHvFtEuBSBWXi9e0urgqNOFQuKE7zokSbEStwG4+gN -E32ZuS2sllOxr41Nx/q2oKMeKePZBqoD5+3mDtRP432KWZjZjlhyez0Kh8aJ8lz5MM7Xxtzo -OyJeO4JHqbuBV82GvoLXVsYJBOUfRuBaZQcphUjamZwDZQFEvoKe6Ltur6+gsqu4UsQzs2bp -i26yaP3e1mrLc9Q5KAH7EkOr7wD3zo7jtJ21luGCBOtZ113oWJZgAwaevDC6cY/k32YgK8+q -iqMtNC7APznXyN4eVjKB18aSM7rVNdE8vlA818b7DbKXsqjH9N7VdiW2/4F8TJNq+OCVPjMf -pfM3KLkCDQRX6R/1ARAAplIU5GesaA42f8+idIEnozpd7aJKs8PuaOUUWr/7CmozpHNXpjPP -uPRflSRmFBeigp50xNfpLwYXjbjoVaiqdPKp6rxko0kh6NcG+pXYvCZOvWaM3e04xppREeiF -UNq8XctterVqWKC5zOgE1wY0346BgWtJvcYL9px71w2EE0bsZ/gwuphOYRblLtbmsKLwheMQ -JO2wfusPsAEGDdoaTRenEmosi/DRWt+oxodZSWygETk8fPESqcvmnjhPpVvCHksdIWEqUBXy -rg6NkkyIjLdMqeuBp/IrUN1XGBOrUgdVNpCNuiMN1Ai+6L9g364fLP7xYB84kLK+QSO03Bpv -j+D5Ca2DRweTmTaCQzaOeR2KW9kgf2tbLJbIoM2OiXLcfGN5bPvZVc2ODverOCRDiVwcVkd+ -sfbG3sUkyV+1NSYTJYTRnaNjsQmNGBfI0mI7v0zEHVt+X0tuJeP5QcMJ1lvLqBiZgZQDFVg4 -vtchDLFTv2JlLfsbyG+U2f2iLA3mauyFRS+x1ZFeIENsXwSqLn1WXvslnkV8cTs4hTFb1Skj -zC89XbjY2PUJMg2XWLeWjvv6pVGvdRVlPuujbou93SMfPSdYPqOrX4eX42I66GXuXMczbu9H -F8kk7OpyP9cYo8LpiHjuxHm/VMFLckagluXwZCl6uiIRB+IJJmd+2jcAEQEAAYkERAQYAQgA -DwUCV+kf9QIbAgUJCWYBgAIpCRA4XLwcf2Z/rsFdIAQZAQgABgUCV+kf9QAKCRBjMbgT6Sl8 -4NSbD/9ueOFntw+rs2q7hAGOq2LP3D/d7SuU+j8vUcszJK2ETQlKX9IcQs3c+T4AbpQ4O5Ea -EvvYEAVmPjosk9zn7sxiWrzvDbvfhQK6hR6zbBK2LB7yTkzBh3oT8WghbCqeTDqJMl47PUv5 -yUVsX4RHmbgo7qymRGiPJ8a+5QPOmtmdoyaEv0hGvszya4aTKexLM4fU+k+e8kupY9fTICE7 -S7zUpX7hpFYC4d/uk3KUkCvebox2C4UomT2kV518/Pnj/6wpWQ3GHnqIurMPOW097VsP3epl -jutNwXM3sH6rbgiiZqdQFb3bq1Da4fpNqnH6Rdm7fSjjV2R36qDrPQz/AfZC2fouq2Xbse6M -RKR48peb80cvtGqhc2J7FHWfEu8da/26Gxq07SOod9svR8eBcJAnlCd3Hca0T2qmaM52WvC+ -Mjxsjgg6yGh0PenjsNQM2mdhvKUflqbLluY4E2QPHVJZlT3Bo5LekM91ZZAgd4F3xBE25/WL -Akg2/rsCiulAfaEXAPQkqCaB7ajd9dvJXcq5qvWSvSgW5vL/nnyecE5ktf8todaMhMz83gpt -eXtR8Ms7401d2Qwt28NifXkgEMMNfytXg/0TO6F0uRGi67SoAeadUjug2JSr7LBmeQHyOvLR -q+0iO1m3f3pSSduqBjKWUFnJShED8FafaRUrE1+HWN2lD/0Sci1X33CrTXNSQCzdTaD3R/SJ -B+BSspEQNV/JqAPjJD9ZK3dwDm5upmrjpFNjSVvcQJoy0J1rW2q2E8y8ECuxErUWQqyFv/Co -y39WpwgWam19ykP3yNiU9UHGb58DhuMRwLOYF7o5Iwg2nbiYtHO5jSmC3PPpYz3TLvA/kSTK -1T1m6ac2dA6UMLn3t3Cohv50wpr41bxLz04ig/dEmrdP72HRpA5oNoXAXCaCeeed5R1DfxgW -RL2fP+GL6ZftTplw3AL2trJa+0zLFHvDo+M4c1brM2x0HYEoX+qSpFMxtixgV0D5Uf7RUMkN -eYPb4SZRc6wDHIt7Wqp/qlUozC94DKbFUrK4UnHyK4+HVlSQJGevqm+Y+QoqIBcnhOEN0Bzo -01aVHIZFxzk4R2bppFEDiFEw1zL2DAPj/xX7Zqrjsg/qdVu9bUklBxir6QSOwZGZMGYCuBWM -uJU3IY7Xzx/6Anm5oqbXLVLwVFwS8tED+/XYjPUo1ifLGVx96THuQrNBMhpwNE/9Qd4zbjnE -7f6foXLgeB/l2h65zrI6O1RdEAUpA8Tuhgy0PwNc/1mviaOkYx9qFlhyjruTd72TV4va+5Qb -L7wnh417OQNbpWUqb5HvN5BruDFQOBztFupi/7LHWnSX4XVO777SYzlf1a7DdJu45cql44d2 -LrdPYOGtAA== -=a0Oj ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.2.4-mysql/Dockerfile b/hawkbit-runtime/docker/0.2.4-mysql/Dockerfile deleted file mode 100644 index 923bdc9b00..0000000000 --- a/hawkbit-runtime/docker/0.2.4-mysql/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM hawkbit/hawkbit-update-server:0.2.4 - -ENV MARIADB_DRIVER_VERSION=2.2.6 - -COPY KEYS . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEYS \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ - && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \ - && apk del build-dependencies - -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.4-mysql/KEYS b/hawkbit-runtime/docker/0.2.4-mysql/KEYS deleted file mode 100644 index 4c602ae045..0000000000 --- a/hawkbit-runtime/docker/0.2.4-mysql/KEYS +++ /dev/null @@ -1,40 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQENBFSTDbABCADuZ2k4NIsmhrSyAw/49GQugqPF40P0ldkTPkKDx8b6eNFtPFJbsyw9yKqU -EIS+9eFtIEMLLR4CIHMM56adZe5q5Wp7g/+rnHgTuefVWfMg42Vaxdk8lTQIN2Z3gSsj36DZ -TtO+SmxixFfxHb2YESUvgVzeWIaFBKZCV4JdumniI02RCAPuqxIHKYmhwuqQSpzIAuZQEVvM -qSwFBUOr+CSf3+YzQ/PmFqldlQOQKbSE6G2H7E1mMhRBI07uryo1gDSM42DSFcZ+eQCzCHQr -CNC+2TtBrPkmPNU7TpngtjBthjwF/qJVVX8/q+syv524E1MtO+uXwf4PvrFJ537SkfdHABEB -AAG0OE1hcmlhREIgRW50ZXJwcmlzZSBTaWduaW5nIEtleSA8c2lnbmluZy1rZXlAbWFyaWFk -Yi5jb20+iEYEEhEIAAYFAlTeJRQACgkQy8sIKhu5Q9tQ8wCfXu/gtMah1J9a+CB1RDKt2s4C -alIAn0LqQcsEib4zrHgBeMwp6Wvre/qZiQE4BBMBAgAiBQJUkw2wAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRDOGj3V48lPSbWuCACnykjC688qarR5aCJOkjQVruc+3GaM/8Mk -8sXT8GZisJyTott6o++tdjx4GLvnBZFssLDfnZwza9rS79GJAdHqshk4t6V8GqTK8OG2IHJk -XKG0xASUTWV3+oLA2Dbw4ILmgWZxncHTnmEx+x2DGUWTshfwrqBMFy0ksKjeWMnFSzOgbTRW -1Z7z3U4cm8dZWNAD6bNQbZBaXDUk/FOTFpGwXqB7DR/y6AMpJq2i+orD0gTW5yhdSsMasHpP -5YCcztONl9Ft08EggkzhwQSzdP+R0eI6uf/wnB9G2nkGQxHsXe1oc1UqOEQpdJgPhEv4lkFP -4izB1Ix/x4YjhlkXZqGziQIcBBIBCAAGBQJU3iVrAAoJEJFxGJmV5FqejVIP/0Qm+CWS+UZ9 -39wUkV/kvfbvhCiVMQmtJDWUJVWRYDXZsfxgdAs4RaKlIrvXShUbWSrGCPwLJkg+FBjXpXqy -/1Qf/TXHrlGGDTZ+SUOfU4O0+HKNqjGdQf3yZdJzoMySY0HdE7eob74ITqnZVjL/bZXsJzZi -xxkqhXZxHi4ToHJkDE75rO2kjYXpaOdg90MiS2nvJm9pexnVvLWIfsPYfkxHaJ3WV+HOZixT -MYKtgiPG6ebiYdOTdbfY8d7uHIxoaqiednBqjpMGygb+YL3SYOWi/rj6LzLs4Z8ISM2OJg01 -2DYL6bsIkHWbf0EcuSVdZ4o5l8V+Z055KI3vRwFadU/fpBHvV1EuXcQNOgKvc19KnoG2RIMQ -/aGVekwzbxqunY2syuQjTEycJPJ02c4r0+o31ge+BQl0K8gmn3F2geS+JqjKNXdJtLYzH3bw -upKKsXmacOUAzyM+ic5BtYkDWiNAxy9Az2OxunXjeFnBjVxJxqVbSbZMlziT1I8I8QHtNNzg -yhd3rmTU3w0oQiVM7XmGPeat09QW8/ift/ABN4t0RdVCTyBtdrzUsI/eIb8NOBLw0gkAgyNe -jiMb8H4WGd4CggA9TGmN/OOpDd0PWSWWR+05oU5LeJAAuWdqSUWGr8qiAXWSnv9Jg9y0SC2C -D7XV0eudrAy94uqeooeVh+x8iQIcBBIBCAAGBQJV8eBgAAoJEEHdwLQNpW8iwDIP/RDSgy1S -43q6SMmJiOyok+kqTBaGKNqouN3TV7vual8sS77vpe/o3sr9SrcAsdiFf4Rq81aJ61ZwJ5JI -0ZnhfJhSOo/3CJiLHsQ/XH1hurmjS0VRtYiZDe8lbLHhPWJsnC96LyPrg4pHCF8SH/XmUN9F -rqq3izeezh1fOsxjPwLixtzaf3yoQI6JzFq+ENzs0PB7JzYnrcO8oGrtVdRJUQIHg3B7Kq0B -c4rc4QPNFxPTxXfQiQtkTzkJHc8I956WFkcxnXxcEJXYdre3LVBnlNkQmvyT48Z5z/jZmBWf -NFqHvndFhGgPMrlgzuMjiEnvjx1jbk2dxQNC/Ugfq2PfTsng8rsjtLTaPoSV/csfCM3Thimm -Wcs1tqfMb9q2uFRG+kR9o8w+3TY5SkY611YqSWpBcAghixOaEGrcyDwBARVZDEEfzyWCqSEd -eQsUrsNYhAiVYI+ubYNKO9rtI+SZi5EtD5nwSKLNZFwDxvRX9PIbaT2vsRNzjqeMOkpjDg7S -79lMicr7idOon4dpLl411HpClV8MnuWmekAa/L9Ee52J50ti3Rx7MDgPISJi9ZykqpPrxmt1 -A+9ZkKE6VB63nTMBOpLUh0zD4yFHYjAUyDpSTH3SLNtVu3UfkLJ+Nr7AAKoV9YQgTmu3wSPR -FsnHsQksxFhCqGYdUKyfRsobs/Ns -=ovQp ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.2.4/Dockerfile b/hawkbit-runtime/docker/0.2.4/Dockerfile deleted file mode 100644 index d133b6e95e..0000000000 --- a/hawkbit-runtime/docker/0.2.4/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM openjdk:8u171-jre-alpine - -ENV HAWKBIT_VERSION=0.2.4 \ - HAWKBIT_HOME=/opt/hawkbit - -EXPOSE 8080 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && mkdir -p $HAWKBIT_HOME \ - && cd $HAWKBIT_HOME \ - && wget -O hawkbit-update-server.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ - && wget -O hawkbit-update-server.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ - && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar \ - && apk del build-dependencies - -VOLUME "$HAWKBIT_HOME/data" - -WORKDIR $HAWKBIT_HOME -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.4/KEY b/hawkbit-runtime/docker/0.2.4/KEY deleted file mode 100644 index 7a959f646d..0000000000 --- a/hawkbit-runtime/docker/0.2.4/KEY +++ /dev/null @@ -1,79 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQINBFflTWwBEAC9YoTvzZlCcQSrqPdovEmAlxlIKzPqE+06Pig87dcn+2PJDDnk9Rl9eDEH -CWKrds4mg7lVgzFApI73V7agHj9bqSyPWbp1GtReDvD4QKNEb4RM9XY8O1rStOTrznhfVIGc -oi9wKPTQWk5GXiqh6rawiyZnAfKm9WPZhKaxIi4m0zcTpJQ2dwbPi0hBpeEMJTyadId4Y+bB -AmH2qGKCOi2NXQDGDJ9BOkjLMVmPlgxnj8QBgZlUgRnVkYNjas/eVcXM5w6BQ884vUuSm35r -PelQOflmUAUiCGoE7UAhfrJdd5tOdWbn9bnCjv1eUyj2hJwJRRwRZjHvsvJygEg7T00Ntur3 -UN8fich29cjPGzjkilqK1NkRPZGROchn5MDhSoeUpGXEDL5bPAWHCNLqus6gMx5vNJ2IuNmW -rHSlsNy0pkWu88xtanjZjgX416nY7RPsmvZ1WRr04tegYB2CGO5aQWK1l+k6ciXWLqC23SAg -FE/2Edbzaxvc6jJi5cVGvvZAoH8J7wXCF0zFwORypNyXbNoiAQQnlW7LBJtJU6KihkuTjbDJ -1wmphLIdMoPTXLOxVVBTM7rsYa3ev9o9V9Z0dkAv364fO7zc/RpEoqM33NmNTzS8DUP/TF6J -UQftNJL+ExCreDqxlkyTgqf/+s/k1Z1kuYEKdRmk4MILVKGZvQARAQABtDFFY2xpcHNlIGhh -d2tCaXQgUHJvamVjdCA8aGF3a2JpdC1kZXZAZWNsaXBzZS5vcmc+iQEcBBABCAAGBQJX6nMW -AAoJEPqgpYKzPV/BDqEIAKAOy1JQjPccNwvZg8Y5OwW2QhB4lvq8ngzniSok/PAGdjsfVlJu -4zPgFkBcqgtAbXycOZXpMXQZBekfWslnDU7RtRAIZ6hJAuiJOL7qOOM3X03YHvq1HVWv2JK/ -g8NSoG1C2dw+GIsK2k4886QGX+a7pN7Mt0ZAbsVAaZx2Cig+iVc74+YW6UY6BiMOj1nGGSyG -9AT0pMgUWBbqvjpeKmiFzP5XVEL7e6pAS4jZAiYNp0xHPdYG/ANiq+hQAArmeaZa2hxOmygJ -CZvh6dYKBXMfRAQFBF8burVyhiJOV2Pn3kCxTSckaO63sZ+ayzBNrVu8Mpf0h2rIEGVVdWlx -KjyJARwEEAEIAAYFAlfrcXQACgkQZZoexg+SnXSfzQf7BWaH/x2yBzCmpbxpbUhI50bGvj6L -jasb6q68Q875ODwls9jve0ip0p7bcRwvbJ4Fd1OypwkxV3R/JdPlfkQwA4CoqHQpMOdN+iQ+ -aA8I86Z/dDL2yZS8e6cTdlRmIwC2RKAkNoy39t0P5UG3Zf6yiES0YaWB0zZQZwtBwNyOOPXD -1L2X/mKXT1yfLgc8YeBx+ojhr8LpzNZKA1vqyQ04YCYByMXy2FGqEaTHwbIZXFJ1IxIs956J -0SD929Nkw3m2/ZSONOLD0uMwb91A9lv9vRWU+bwp18S5j63N5NEEM6QsGOt9VgDhy01zdb46 -1e99V1IYkh863gCEHyJFOJi+RYkCHAQQAQgABgUCV+VPmAAKCRCforcpn1HlQ5VCD/9SxkSV -iV8sywK3cZm9lkYlnot33lAH/dYDf4md1mOf8vfNWTB0L9s5LOK9n6SWHdEKYd+f3OAP7ZM5 -Div30B/TmkyR4BgtMAkDOQSIR5+iEzXI2+iklEb1I+vhFVkKNOGoOaWRiDWZScWgwPBylYuj -iPjRAjKxtZuuhy5A4d6HkvdugoQ+4GdHeazkSeXLADz6XFBrQpUrTGCuNqdpE8QKkX4xmZ4L -Vvur3h/STBsJBfewuC4FhDTryFdd/vygivV7LrHzJlgTNqoK+oxL0wiietLtHvpwpS/gGcrq -a+8ccvPN+HhGCgpkeULEp8MUwp5fqoJxU57AZHUo/ER+6jmMSRz8V7M/VoZxwoGcH3o+paYw -GfxEPovaA6jadzEQomQTK3qsrx8nXflYPH39o3NYBM+MBLnsv6kndPqBb7OtBt2ZVges04zM -mbIYgpAUZgIOoCR75uU21DO2hbS7EHwd4nqY5vOfFSlMgtBcInjmXRiqDADspJv3938J/E2n -7M7ijERcQn6UmhCmdYLCLo2bAODp0mjjcftu6Ct65VLP1WRp95qr21VSDBoozwd9eL0AzAoC -SOhZPmDoeFoo3QcekEi4gxRtQvSdEZ0YteUENXmpSX+c/IKba5lpk4baC52HvhlNlmeu0DxX -VWqYF7O/9Z4hl2lQ5LHiSb2L0S1+6YkCPQQTAQgAJwUCV+VNbAIbLwUJCWYBgAULCQgHAwUV -CgkICwUWAgMBAAIeAQIXgAAKCRA4XLwcf2Z/rujfD/0Wp1uYXRsAzEcZavASh1Xe2301atbU -aRUy8UsNWO5oCvVjyyaPM4c3MT72sqsLyNXAWhi/MP63M0qr2+M0nN/91U8r98/Mbd+WlzRy -CLJYUX72Oqrfan+hZxcd7Xlu+sKHNshOlCy4114bVnrdq16LfeIAkx7GLw9/lMc9lRrvUwMI -684zhquROpuDD1aE/i/gBGgzd8cMoW+hdjFVA0zwe+6FgrWR2CMiKCJfeYWLuFiBNmFZC6l8 -BqiEqCuyQu6dFpWHhtK3fPJAEYIiNkORT8M3HSXl/Ex/w9ErweZKHiSja7KMAUWXkZi+Ayva -jMVI4jumXwgZW/7uuSc6bbv2SO4BSfMHvFtEuBSBWXi9e0urgqNOFQuKE7zokSbEStwG4+gN -E32ZuS2sllOxr41Nx/q2oKMeKePZBqoD5+3mDtRP432KWZjZjlhyez0Kh8aJ8lz5MM7Xxtzo -OyJeO4JHqbuBV82GvoLXVsYJBOUfRuBaZQcphUjamZwDZQFEvoKe6Ltur6+gsqu4UsQzs2bp -i26yaP3e1mrLc9Q5KAH7EkOr7wD3zo7jtJ21luGCBOtZ113oWJZgAwaevDC6cY/k32YgK8+q -iqMtNC7APznXyN4eVjKB18aSM7rVNdE8vlA818b7DbKXsqjH9N7VdiW2/4F8TJNq+OCVPjMf -pfM3KLkCDQRX6R/1ARAAplIU5GesaA42f8+idIEnozpd7aJKs8PuaOUUWr/7CmozpHNXpjPP -uPRflSRmFBeigp50xNfpLwYXjbjoVaiqdPKp6rxko0kh6NcG+pXYvCZOvWaM3e04xppREeiF -UNq8XctterVqWKC5zOgE1wY0346BgWtJvcYL9px71w2EE0bsZ/gwuphOYRblLtbmsKLwheMQ -JO2wfusPsAEGDdoaTRenEmosi/DRWt+oxodZSWygETk8fPESqcvmnjhPpVvCHksdIWEqUBXy -rg6NkkyIjLdMqeuBp/IrUN1XGBOrUgdVNpCNuiMN1Ai+6L9g364fLP7xYB84kLK+QSO03Bpv -j+D5Ca2DRweTmTaCQzaOeR2KW9kgf2tbLJbIoM2OiXLcfGN5bPvZVc2ODverOCRDiVwcVkd+ -sfbG3sUkyV+1NSYTJYTRnaNjsQmNGBfI0mI7v0zEHVt+X0tuJeP5QcMJ1lvLqBiZgZQDFVg4 -vtchDLFTv2JlLfsbyG+U2f2iLA3mauyFRS+x1ZFeIENsXwSqLn1WXvslnkV8cTs4hTFb1Skj -zC89XbjY2PUJMg2XWLeWjvv6pVGvdRVlPuujbou93SMfPSdYPqOrX4eX42I66GXuXMczbu9H -F8kk7OpyP9cYo8LpiHjuxHm/VMFLckagluXwZCl6uiIRB+IJJmd+2jcAEQEAAYkERAQYAQgA -DwUCV+kf9QIbAgUJCWYBgAIpCRA4XLwcf2Z/rsFdIAQZAQgABgUCV+kf9QAKCRBjMbgT6Sl8 -4NSbD/9ueOFntw+rs2q7hAGOq2LP3D/d7SuU+j8vUcszJK2ETQlKX9IcQs3c+T4AbpQ4O5Ea -EvvYEAVmPjosk9zn7sxiWrzvDbvfhQK6hR6zbBK2LB7yTkzBh3oT8WghbCqeTDqJMl47PUv5 -yUVsX4RHmbgo7qymRGiPJ8a+5QPOmtmdoyaEv0hGvszya4aTKexLM4fU+k+e8kupY9fTICE7 -S7zUpX7hpFYC4d/uk3KUkCvebox2C4UomT2kV518/Pnj/6wpWQ3GHnqIurMPOW097VsP3epl -jutNwXM3sH6rbgiiZqdQFb3bq1Da4fpNqnH6Rdm7fSjjV2R36qDrPQz/AfZC2fouq2Xbse6M -RKR48peb80cvtGqhc2J7FHWfEu8da/26Gxq07SOod9svR8eBcJAnlCd3Hca0T2qmaM52WvC+ -Mjxsjgg6yGh0PenjsNQM2mdhvKUflqbLluY4E2QPHVJZlT3Bo5LekM91ZZAgd4F3xBE25/WL -Akg2/rsCiulAfaEXAPQkqCaB7ajd9dvJXcq5qvWSvSgW5vL/nnyecE5ktf8todaMhMz83gpt -eXtR8Ms7401d2Qwt28NifXkgEMMNfytXg/0TO6F0uRGi67SoAeadUjug2JSr7LBmeQHyOvLR -q+0iO1m3f3pSSduqBjKWUFnJShED8FafaRUrE1+HWN2lD/0Sci1X33CrTXNSQCzdTaD3R/SJ -B+BSspEQNV/JqAPjJD9ZK3dwDm5upmrjpFNjSVvcQJoy0J1rW2q2E8y8ECuxErUWQqyFv/Co -y39WpwgWam19ykP3yNiU9UHGb58DhuMRwLOYF7o5Iwg2nbiYtHO5jSmC3PPpYz3TLvA/kSTK -1T1m6ac2dA6UMLn3t3Cohv50wpr41bxLz04ig/dEmrdP72HRpA5oNoXAXCaCeeed5R1DfxgW -RL2fP+GL6ZftTplw3AL2trJa+0zLFHvDo+M4c1brM2x0HYEoX+qSpFMxtixgV0D5Uf7RUMkN -eYPb4SZRc6wDHIt7Wqp/qlUozC94DKbFUrK4UnHyK4+HVlSQJGevqm+Y+QoqIBcnhOEN0Bzo -01aVHIZFxzk4R2bppFEDiFEw1zL2DAPj/xX7Zqrjsg/qdVu9bUklBxir6QSOwZGZMGYCuBWM -uJU3IY7Xzx/6Anm5oqbXLVLwVFwS8tED+/XYjPUo1ifLGVx96THuQrNBMhpwNE/9Qd4zbjnE -7f6foXLgeB/l2h65zrI6O1RdEAUpA8Tuhgy0PwNc/1mviaOkYx9qFlhyjruTd72TV4va+5Qb -L7wnh417OQNbpWUqb5HvN5BruDFQOBztFupi/7LHWnSX4XVO777SYzlf1a7DdJu45cql44d2 -LrdPYOGtAA== -=a0Oj ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.2.5-mysql/Dockerfile b/hawkbit-runtime/docker/0.2.5-mysql/Dockerfile deleted file mode 100644 index 06f7d413e6..0000000000 --- a/hawkbit-runtime/docker/0.2.5-mysql/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM hawkbit/hawkbit-update-server:0.2.5 - -ENV MARIADB_DRIVER_VERSION=2.3.0 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ - && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \ - && apk del build-dependencies - -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.5-mysql/KEY b/hawkbit-runtime/docker/0.2.5-mysql/KEY deleted file mode 100644 index 4c602ae045..0000000000 --- a/hawkbit-runtime/docker/0.2.5-mysql/KEY +++ /dev/null @@ -1,40 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQENBFSTDbABCADuZ2k4NIsmhrSyAw/49GQugqPF40P0ldkTPkKDx8b6eNFtPFJbsyw9yKqU -EIS+9eFtIEMLLR4CIHMM56adZe5q5Wp7g/+rnHgTuefVWfMg42Vaxdk8lTQIN2Z3gSsj36DZ -TtO+SmxixFfxHb2YESUvgVzeWIaFBKZCV4JdumniI02RCAPuqxIHKYmhwuqQSpzIAuZQEVvM -qSwFBUOr+CSf3+YzQ/PmFqldlQOQKbSE6G2H7E1mMhRBI07uryo1gDSM42DSFcZ+eQCzCHQr -CNC+2TtBrPkmPNU7TpngtjBthjwF/qJVVX8/q+syv524E1MtO+uXwf4PvrFJ537SkfdHABEB -AAG0OE1hcmlhREIgRW50ZXJwcmlzZSBTaWduaW5nIEtleSA8c2lnbmluZy1rZXlAbWFyaWFk -Yi5jb20+iEYEEhEIAAYFAlTeJRQACgkQy8sIKhu5Q9tQ8wCfXu/gtMah1J9a+CB1RDKt2s4C -alIAn0LqQcsEib4zrHgBeMwp6Wvre/qZiQE4BBMBAgAiBQJUkw2wAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRDOGj3V48lPSbWuCACnykjC688qarR5aCJOkjQVruc+3GaM/8Mk -8sXT8GZisJyTott6o++tdjx4GLvnBZFssLDfnZwza9rS79GJAdHqshk4t6V8GqTK8OG2IHJk -XKG0xASUTWV3+oLA2Dbw4ILmgWZxncHTnmEx+x2DGUWTshfwrqBMFy0ksKjeWMnFSzOgbTRW -1Z7z3U4cm8dZWNAD6bNQbZBaXDUk/FOTFpGwXqB7DR/y6AMpJq2i+orD0gTW5yhdSsMasHpP -5YCcztONl9Ft08EggkzhwQSzdP+R0eI6uf/wnB9G2nkGQxHsXe1oc1UqOEQpdJgPhEv4lkFP -4izB1Ix/x4YjhlkXZqGziQIcBBIBCAAGBQJU3iVrAAoJEJFxGJmV5FqejVIP/0Qm+CWS+UZ9 -39wUkV/kvfbvhCiVMQmtJDWUJVWRYDXZsfxgdAs4RaKlIrvXShUbWSrGCPwLJkg+FBjXpXqy -/1Qf/TXHrlGGDTZ+SUOfU4O0+HKNqjGdQf3yZdJzoMySY0HdE7eob74ITqnZVjL/bZXsJzZi -xxkqhXZxHi4ToHJkDE75rO2kjYXpaOdg90MiS2nvJm9pexnVvLWIfsPYfkxHaJ3WV+HOZixT -MYKtgiPG6ebiYdOTdbfY8d7uHIxoaqiednBqjpMGygb+YL3SYOWi/rj6LzLs4Z8ISM2OJg01 -2DYL6bsIkHWbf0EcuSVdZ4o5l8V+Z055KI3vRwFadU/fpBHvV1EuXcQNOgKvc19KnoG2RIMQ -/aGVekwzbxqunY2syuQjTEycJPJ02c4r0+o31ge+BQl0K8gmn3F2geS+JqjKNXdJtLYzH3bw -upKKsXmacOUAzyM+ic5BtYkDWiNAxy9Az2OxunXjeFnBjVxJxqVbSbZMlziT1I8I8QHtNNzg -yhd3rmTU3w0oQiVM7XmGPeat09QW8/ift/ABN4t0RdVCTyBtdrzUsI/eIb8NOBLw0gkAgyNe -jiMb8H4WGd4CggA9TGmN/OOpDd0PWSWWR+05oU5LeJAAuWdqSUWGr8qiAXWSnv9Jg9y0SC2C -D7XV0eudrAy94uqeooeVh+x8iQIcBBIBCAAGBQJV8eBgAAoJEEHdwLQNpW8iwDIP/RDSgy1S -43q6SMmJiOyok+kqTBaGKNqouN3TV7vual8sS77vpe/o3sr9SrcAsdiFf4Rq81aJ61ZwJ5JI -0ZnhfJhSOo/3CJiLHsQ/XH1hurmjS0VRtYiZDe8lbLHhPWJsnC96LyPrg4pHCF8SH/XmUN9F -rqq3izeezh1fOsxjPwLixtzaf3yoQI6JzFq+ENzs0PB7JzYnrcO8oGrtVdRJUQIHg3B7Kq0B -c4rc4QPNFxPTxXfQiQtkTzkJHc8I956WFkcxnXxcEJXYdre3LVBnlNkQmvyT48Z5z/jZmBWf -NFqHvndFhGgPMrlgzuMjiEnvjx1jbk2dxQNC/Ugfq2PfTsng8rsjtLTaPoSV/csfCM3Thimm -Wcs1tqfMb9q2uFRG+kR9o8w+3TY5SkY611YqSWpBcAghixOaEGrcyDwBARVZDEEfzyWCqSEd -eQsUrsNYhAiVYI+ubYNKO9rtI+SZi5EtD5nwSKLNZFwDxvRX9PIbaT2vsRNzjqeMOkpjDg7S -79lMicr7idOon4dpLl411HpClV8MnuWmekAa/L9Ee52J50ti3Rx7MDgPISJi9ZykqpPrxmt1 -A+9ZkKE6VB63nTMBOpLUh0zD4yFHYjAUyDpSTH3SLNtVu3UfkLJ+Nr7AAKoV9YQgTmu3wSPR -FsnHsQksxFhCqGYdUKyfRsobs/Ns -=ovQp ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.2.5/Dockerfile b/hawkbit-runtime/docker/0.2.5/Dockerfile deleted file mode 100644 index 844d29bdf2..0000000000 --- a/hawkbit-runtime/docker/0.2.5/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM openjdk:8u181-jre-alpine - -ENV HAWKBIT_VERSION=0.2.5 \ - HAWKBIT_HOME=/opt/hawkbit - -EXPOSE 8080 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && mkdir -p $HAWKBIT_HOME \ - && cd $HAWKBIT_HOME \ - && wget -O hawkbit-update-server.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ - && wget -O hawkbit-update-server.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ - && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar \ - && apk del build-dependencies - -VOLUME "$HAWKBIT_HOME/data" - -WORKDIR $HAWKBIT_HOME -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.5/KEY b/hawkbit-runtime/docker/0.2.5/KEY deleted file mode 100644 index 7a959f646d..0000000000 --- a/hawkbit-runtime/docker/0.2.5/KEY +++ /dev/null @@ -1,79 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQINBFflTWwBEAC9YoTvzZlCcQSrqPdovEmAlxlIKzPqE+06Pig87dcn+2PJDDnk9Rl9eDEH -CWKrds4mg7lVgzFApI73V7agHj9bqSyPWbp1GtReDvD4QKNEb4RM9XY8O1rStOTrznhfVIGc -oi9wKPTQWk5GXiqh6rawiyZnAfKm9WPZhKaxIi4m0zcTpJQ2dwbPi0hBpeEMJTyadId4Y+bB -AmH2qGKCOi2NXQDGDJ9BOkjLMVmPlgxnj8QBgZlUgRnVkYNjas/eVcXM5w6BQ884vUuSm35r -PelQOflmUAUiCGoE7UAhfrJdd5tOdWbn9bnCjv1eUyj2hJwJRRwRZjHvsvJygEg7T00Ntur3 -UN8fich29cjPGzjkilqK1NkRPZGROchn5MDhSoeUpGXEDL5bPAWHCNLqus6gMx5vNJ2IuNmW -rHSlsNy0pkWu88xtanjZjgX416nY7RPsmvZ1WRr04tegYB2CGO5aQWK1l+k6ciXWLqC23SAg -FE/2Edbzaxvc6jJi5cVGvvZAoH8J7wXCF0zFwORypNyXbNoiAQQnlW7LBJtJU6KihkuTjbDJ -1wmphLIdMoPTXLOxVVBTM7rsYa3ev9o9V9Z0dkAv364fO7zc/RpEoqM33NmNTzS8DUP/TF6J -UQftNJL+ExCreDqxlkyTgqf/+s/k1Z1kuYEKdRmk4MILVKGZvQARAQABtDFFY2xpcHNlIGhh -d2tCaXQgUHJvamVjdCA8aGF3a2JpdC1kZXZAZWNsaXBzZS5vcmc+iQEcBBABCAAGBQJX6nMW -AAoJEPqgpYKzPV/BDqEIAKAOy1JQjPccNwvZg8Y5OwW2QhB4lvq8ngzniSok/PAGdjsfVlJu -4zPgFkBcqgtAbXycOZXpMXQZBekfWslnDU7RtRAIZ6hJAuiJOL7qOOM3X03YHvq1HVWv2JK/ -g8NSoG1C2dw+GIsK2k4886QGX+a7pN7Mt0ZAbsVAaZx2Cig+iVc74+YW6UY6BiMOj1nGGSyG -9AT0pMgUWBbqvjpeKmiFzP5XVEL7e6pAS4jZAiYNp0xHPdYG/ANiq+hQAArmeaZa2hxOmygJ -CZvh6dYKBXMfRAQFBF8burVyhiJOV2Pn3kCxTSckaO63sZ+ayzBNrVu8Mpf0h2rIEGVVdWlx -KjyJARwEEAEIAAYFAlfrcXQACgkQZZoexg+SnXSfzQf7BWaH/x2yBzCmpbxpbUhI50bGvj6L -jasb6q68Q875ODwls9jve0ip0p7bcRwvbJ4Fd1OypwkxV3R/JdPlfkQwA4CoqHQpMOdN+iQ+ -aA8I86Z/dDL2yZS8e6cTdlRmIwC2RKAkNoy39t0P5UG3Zf6yiES0YaWB0zZQZwtBwNyOOPXD -1L2X/mKXT1yfLgc8YeBx+ojhr8LpzNZKA1vqyQ04YCYByMXy2FGqEaTHwbIZXFJ1IxIs956J -0SD929Nkw3m2/ZSONOLD0uMwb91A9lv9vRWU+bwp18S5j63N5NEEM6QsGOt9VgDhy01zdb46 -1e99V1IYkh863gCEHyJFOJi+RYkCHAQQAQgABgUCV+VPmAAKCRCforcpn1HlQ5VCD/9SxkSV -iV8sywK3cZm9lkYlnot33lAH/dYDf4md1mOf8vfNWTB0L9s5LOK9n6SWHdEKYd+f3OAP7ZM5 -Div30B/TmkyR4BgtMAkDOQSIR5+iEzXI2+iklEb1I+vhFVkKNOGoOaWRiDWZScWgwPBylYuj -iPjRAjKxtZuuhy5A4d6HkvdugoQ+4GdHeazkSeXLADz6XFBrQpUrTGCuNqdpE8QKkX4xmZ4L -Vvur3h/STBsJBfewuC4FhDTryFdd/vygivV7LrHzJlgTNqoK+oxL0wiietLtHvpwpS/gGcrq -a+8ccvPN+HhGCgpkeULEp8MUwp5fqoJxU57AZHUo/ER+6jmMSRz8V7M/VoZxwoGcH3o+paYw -GfxEPovaA6jadzEQomQTK3qsrx8nXflYPH39o3NYBM+MBLnsv6kndPqBb7OtBt2ZVges04zM -mbIYgpAUZgIOoCR75uU21DO2hbS7EHwd4nqY5vOfFSlMgtBcInjmXRiqDADspJv3938J/E2n -7M7ijERcQn6UmhCmdYLCLo2bAODp0mjjcftu6Ct65VLP1WRp95qr21VSDBoozwd9eL0AzAoC -SOhZPmDoeFoo3QcekEi4gxRtQvSdEZ0YteUENXmpSX+c/IKba5lpk4baC52HvhlNlmeu0DxX -VWqYF7O/9Z4hl2lQ5LHiSb2L0S1+6YkCPQQTAQgAJwUCV+VNbAIbLwUJCWYBgAULCQgHAwUV -CgkICwUWAgMBAAIeAQIXgAAKCRA4XLwcf2Z/rujfD/0Wp1uYXRsAzEcZavASh1Xe2301atbU -aRUy8UsNWO5oCvVjyyaPM4c3MT72sqsLyNXAWhi/MP63M0qr2+M0nN/91U8r98/Mbd+WlzRy -CLJYUX72Oqrfan+hZxcd7Xlu+sKHNshOlCy4114bVnrdq16LfeIAkx7GLw9/lMc9lRrvUwMI -684zhquROpuDD1aE/i/gBGgzd8cMoW+hdjFVA0zwe+6FgrWR2CMiKCJfeYWLuFiBNmFZC6l8 -BqiEqCuyQu6dFpWHhtK3fPJAEYIiNkORT8M3HSXl/Ex/w9ErweZKHiSja7KMAUWXkZi+Ayva -jMVI4jumXwgZW/7uuSc6bbv2SO4BSfMHvFtEuBSBWXi9e0urgqNOFQuKE7zokSbEStwG4+gN -E32ZuS2sllOxr41Nx/q2oKMeKePZBqoD5+3mDtRP432KWZjZjlhyez0Kh8aJ8lz5MM7Xxtzo -OyJeO4JHqbuBV82GvoLXVsYJBOUfRuBaZQcphUjamZwDZQFEvoKe6Ltur6+gsqu4UsQzs2bp -i26yaP3e1mrLc9Q5KAH7EkOr7wD3zo7jtJ21luGCBOtZ113oWJZgAwaevDC6cY/k32YgK8+q -iqMtNC7APznXyN4eVjKB18aSM7rVNdE8vlA818b7DbKXsqjH9N7VdiW2/4F8TJNq+OCVPjMf -pfM3KLkCDQRX6R/1ARAAplIU5GesaA42f8+idIEnozpd7aJKs8PuaOUUWr/7CmozpHNXpjPP -uPRflSRmFBeigp50xNfpLwYXjbjoVaiqdPKp6rxko0kh6NcG+pXYvCZOvWaM3e04xppREeiF -UNq8XctterVqWKC5zOgE1wY0346BgWtJvcYL9px71w2EE0bsZ/gwuphOYRblLtbmsKLwheMQ -JO2wfusPsAEGDdoaTRenEmosi/DRWt+oxodZSWygETk8fPESqcvmnjhPpVvCHksdIWEqUBXy -rg6NkkyIjLdMqeuBp/IrUN1XGBOrUgdVNpCNuiMN1Ai+6L9g364fLP7xYB84kLK+QSO03Bpv -j+D5Ca2DRweTmTaCQzaOeR2KW9kgf2tbLJbIoM2OiXLcfGN5bPvZVc2ODverOCRDiVwcVkd+ -sfbG3sUkyV+1NSYTJYTRnaNjsQmNGBfI0mI7v0zEHVt+X0tuJeP5QcMJ1lvLqBiZgZQDFVg4 -vtchDLFTv2JlLfsbyG+U2f2iLA3mauyFRS+x1ZFeIENsXwSqLn1WXvslnkV8cTs4hTFb1Skj -zC89XbjY2PUJMg2XWLeWjvv6pVGvdRVlPuujbou93SMfPSdYPqOrX4eX42I66GXuXMczbu9H -F8kk7OpyP9cYo8LpiHjuxHm/VMFLckagluXwZCl6uiIRB+IJJmd+2jcAEQEAAYkERAQYAQgA -DwUCV+kf9QIbAgUJCWYBgAIpCRA4XLwcf2Z/rsFdIAQZAQgABgUCV+kf9QAKCRBjMbgT6Sl8 -4NSbD/9ueOFntw+rs2q7hAGOq2LP3D/d7SuU+j8vUcszJK2ETQlKX9IcQs3c+T4AbpQ4O5Ea -EvvYEAVmPjosk9zn7sxiWrzvDbvfhQK6hR6zbBK2LB7yTkzBh3oT8WghbCqeTDqJMl47PUv5 -yUVsX4RHmbgo7qymRGiPJ8a+5QPOmtmdoyaEv0hGvszya4aTKexLM4fU+k+e8kupY9fTICE7 -S7zUpX7hpFYC4d/uk3KUkCvebox2C4UomT2kV518/Pnj/6wpWQ3GHnqIurMPOW097VsP3epl -jutNwXM3sH6rbgiiZqdQFb3bq1Da4fpNqnH6Rdm7fSjjV2R36qDrPQz/AfZC2fouq2Xbse6M -RKR48peb80cvtGqhc2J7FHWfEu8da/26Gxq07SOod9svR8eBcJAnlCd3Hca0T2qmaM52WvC+ -Mjxsjgg6yGh0PenjsNQM2mdhvKUflqbLluY4E2QPHVJZlT3Bo5LekM91ZZAgd4F3xBE25/WL -Akg2/rsCiulAfaEXAPQkqCaB7ajd9dvJXcq5qvWSvSgW5vL/nnyecE5ktf8todaMhMz83gpt -eXtR8Ms7401d2Qwt28NifXkgEMMNfytXg/0TO6F0uRGi67SoAeadUjug2JSr7LBmeQHyOvLR -q+0iO1m3f3pSSduqBjKWUFnJShED8FafaRUrE1+HWN2lD/0Sci1X33CrTXNSQCzdTaD3R/SJ -B+BSspEQNV/JqAPjJD9ZK3dwDm5upmrjpFNjSVvcQJoy0J1rW2q2E8y8ECuxErUWQqyFv/Co -y39WpwgWam19ykP3yNiU9UHGb58DhuMRwLOYF7o5Iwg2nbiYtHO5jSmC3PPpYz3TLvA/kSTK -1T1m6ac2dA6UMLn3t3Cohv50wpr41bxLz04ig/dEmrdP72HRpA5oNoXAXCaCeeed5R1DfxgW -RL2fP+GL6ZftTplw3AL2trJa+0zLFHvDo+M4c1brM2x0HYEoX+qSpFMxtixgV0D5Uf7RUMkN -eYPb4SZRc6wDHIt7Wqp/qlUozC94DKbFUrK4UnHyK4+HVlSQJGevqm+Y+QoqIBcnhOEN0Bzo -01aVHIZFxzk4R2bppFEDiFEw1zL2DAPj/xX7Zqrjsg/qdVu9bUklBxir6QSOwZGZMGYCuBWM -uJU3IY7Xzx/6Anm5oqbXLVLwVFwS8tED+/XYjPUo1ifLGVx96THuQrNBMhpwNE/9Qd4zbjnE -7f6foXLgeB/l2h65zrI6O1RdEAUpA8Tuhgy0PwNc/1mviaOkYx9qFlhyjruTd72TV4va+5Qb -L7wnh417OQNbpWUqb5HvN5BruDFQOBztFupi/7LHWnSX4XVO777SYzlf1a7DdJu45cql44d2 -LrdPYOGtAA== -=a0Oj ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.3.0M2-mysql/Dockerfile b/hawkbit-runtime/docker/0.3.0M2-mysql/Dockerfile deleted file mode 100644 index 64d000ac7f..0000000000 --- a/hawkbit-runtime/docker/0.3.0M2-mysql/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM hawkbit/hawkbit-update-server:0.3.0M2 - -ENV MARIADB_DRIVER_VERSION=2.3.0 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose http://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ - && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \ - && apk del build-dependencies - -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.3.0M2-mysql/KEY b/hawkbit-runtime/docker/0.3.0M2-mysql/KEY deleted file mode 100644 index 4c602ae045..0000000000 --- a/hawkbit-runtime/docker/0.3.0M2-mysql/KEY +++ /dev/null @@ -1,40 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQENBFSTDbABCADuZ2k4NIsmhrSyAw/49GQugqPF40P0ldkTPkKDx8b6eNFtPFJbsyw9yKqU -EIS+9eFtIEMLLR4CIHMM56adZe5q5Wp7g/+rnHgTuefVWfMg42Vaxdk8lTQIN2Z3gSsj36DZ -TtO+SmxixFfxHb2YESUvgVzeWIaFBKZCV4JdumniI02RCAPuqxIHKYmhwuqQSpzIAuZQEVvM -qSwFBUOr+CSf3+YzQ/PmFqldlQOQKbSE6G2H7E1mMhRBI07uryo1gDSM42DSFcZ+eQCzCHQr -CNC+2TtBrPkmPNU7TpngtjBthjwF/qJVVX8/q+syv524E1MtO+uXwf4PvrFJ537SkfdHABEB -AAG0OE1hcmlhREIgRW50ZXJwcmlzZSBTaWduaW5nIEtleSA8c2lnbmluZy1rZXlAbWFyaWFk -Yi5jb20+iEYEEhEIAAYFAlTeJRQACgkQy8sIKhu5Q9tQ8wCfXu/gtMah1J9a+CB1RDKt2s4C -alIAn0LqQcsEib4zrHgBeMwp6Wvre/qZiQE4BBMBAgAiBQJUkw2wAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRDOGj3V48lPSbWuCACnykjC688qarR5aCJOkjQVruc+3GaM/8Mk -8sXT8GZisJyTott6o++tdjx4GLvnBZFssLDfnZwza9rS79GJAdHqshk4t6V8GqTK8OG2IHJk -XKG0xASUTWV3+oLA2Dbw4ILmgWZxncHTnmEx+x2DGUWTshfwrqBMFy0ksKjeWMnFSzOgbTRW -1Z7z3U4cm8dZWNAD6bNQbZBaXDUk/FOTFpGwXqB7DR/y6AMpJq2i+orD0gTW5yhdSsMasHpP -5YCcztONl9Ft08EggkzhwQSzdP+R0eI6uf/wnB9G2nkGQxHsXe1oc1UqOEQpdJgPhEv4lkFP -4izB1Ix/x4YjhlkXZqGziQIcBBIBCAAGBQJU3iVrAAoJEJFxGJmV5FqejVIP/0Qm+CWS+UZ9 -39wUkV/kvfbvhCiVMQmtJDWUJVWRYDXZsfxgdAs4RaKlIrvXShUbWSrGCPwLJkg+FBjXpXqy -/1Qf/TXHrlGGDTZ+SUOfU4O0+HKNqjGdQf3yZdJzoMySY0HdE7eob74ITqnZVjL/bZXsJzZi -xxkqhXZxHi4ToHJkDE75rO2kjYXpaOdg90MiS2nvJm9pexnVvLWIfsPYfkxHaJ3WV+HOZixT -MYKtgiPG6ebiYdOTdbfY8d7uHIxoaqiednBqjpMGygb+YL3SYOWi/rj6LzLs4Z8ISM2OJg01 -2DYL6bsIkHWbf0EcuSVdZ4o5l8V+Z055KI3vRwFadU/fpBHvV1EuXcQNOgKvc19KnoG2RIMQ -/aGVekwzbxqunY2syuQjTEycJPJ02c4r0+o31ge+BQl0K8gmn3F2geS+JqjKNXdJtLYzH3bw -upKKsXmacOUAzyM+ic5BtYkDWiNAxy9Az2OxunXjeFnBjVxJxqVbSbZMlziT1I8I8QHtNNzg -yhd3rmTU3w0oQiVM7XmGPeat09QW8/ift/ABN4t0RdVCTyBtdrzUsI/eIb8NOBLw0gkAgyNe -jiMb8H4WGd4CggA9TGmN/OOpDd0PWSWWR+05oU5LeJAAuWdqSUWGr8qiAXWSnv9Jg9y0SC2C -D7XV0eudrAy94uqeooeVh+x8iQIcBBIBCAAGBQJV8eBgAAoJEEHdwLQNpW8iwDIP/RDSgy1S -43q6SMmJiOyok+kqTBaGKNqouN3TV7vual8sS77vpe/o3sr9SrcAsdiFf4Rq81aJ61ZwJ5JI -0ZnhfJhSOo/3CJiLHsQ/XH1hurmjS0VRtYiZDe8lbLHhPWJsnC96LyPrg4pHCF8SH/XmUN9F -rqq3izeezh1fOsxjPwLixtzaf3yoQI6JzFq+ENzs0PB7JzYnrcO8oGrtVdRJUQIHg3B7Kq0B -c4rc4QPNFxPTxXfQiQtkTzkJHc8I956WFkcxnXxcEJXYdre3LVBnlNkQmvyT48Z5z/jZmBWf -NFqHvndFhGgPMrlgzuMjiEnvjx1jbk2dxQNC/Ugfq2PfTsng8rsjtLTaPoSV/csfCM3Thimm -Wcs1tqfMb9q2uFRG+kR9o8w+3TY5SkY611YqSWpBcAghixOaEGrcyDwBARVZDEEfzyWCqSEd -eQsUrsNYhAiVYI+ubYNKO9rtI+SZi5EtD5nwSKLNZFwDxvRX9PIbaT2vsRNzjqeMOkpjDg7S -79lMicr7idOon4dpLl411HpClV8MnuWmekAa/L9Ee52J50ti3Rx7MDgPISJi9ZykqpPrxmt1 -A+9ZkKE6VB63nTMBOpLUh0zD4yFHYjAUyDpSTH3SLNtVu3UfkLJ+Nr7AAKoV9YQgTmu3wSPR -FsnHsQksxFhCqGYdUKyfRsobs/Ns -=ovQp ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.3.0M2/Dockerfile b/hawkbit-runtime/docker/0.3.0M2/Dockerfile deleted file mode 100644 index f701cc0854..0000000000 --- a/hawkbit-runtime/docker/0.3.0M2/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM openjdk:8u201-jre-alpine - -ENV HAWKBIT_VERSION=0.3.0M2 \ - HAWKBIT_HOME=/opt/hawkbit - -EXPOSE 8080 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && mkdir -p $HAWKBIT_HOME \ - && cd $HAWKBIT_HOME \ - && wget -O hawkbit-update-server.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ - && wget -O hawkbit-update-server.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ - && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar \ - && apk del build-dependencies - -VOLUME "$HAWKBIT_HOME/data" - -WORKDIR $HAWKBIT_HOME -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.3.0M2/KEY b/hawkbit-runtime/docker/0.3.0M2/KEY deleted file mode 100644 index 7a959f646d..0000000000 --- a/hawkbit-runtime/docker/0.3.0M2/KEY +++ /dev/null @@ -1,79 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQINBFflTWwBEAC9YoTvzZlCcQSrqPdovEmAlxlIKzPqE+06Pig87dcn+2PJDDnk9Rl9eDEH -CWKrds4mg7lVgzFApI73V7agHj9bqSyPWbp1GtReDvD4QKNEb4RM9XY8O1rStOTrznhfVIGc -oi9wKPTQWk5GXiqh6rawiyZnAfKm9WPZhKaxIi4m0zcTpJQ2dwbPi0hBpeEMJTyadId4Y+bB -AmH2qGKCOi2NXQDGDJ9BOkjLMVmPlgxnj8QBgZlUgRnVkYNjas/eVcXM5w6BQ884vUuSm35r -PelQOflmUAUiCGoE7UAhfrJdd5tOdWbn9bnCjv1eUyj2hJwJRRwRZjHvsvJygEg7T00Ntur3 -UN8fich29cjPGzjkilqK1NkRPZGROchn5MDhSoeUpGXEDL5bPAWHCNLqus6gMx5vNJ2IuNmW -rHSlsNy0pkWu88xtanjZjgX416nY7RPsmvZ1WRr04tegYB2CGO5aQWK1l+k6ciXWLqC23SAg -FE/2Edbzaxvc6jJi5cVGvvZAoH8J7wXCF0zFwORypNyXbNoiAQQnlW7LBJtJU6KihkuTjbDJ -1wmphLIdMoPTXLOxVVBTM7rsYa3ev9o9V9Z0dkAv364fO7zc/RpEoqM33NmNTzS8DUP/TF6J -UQftNJL+ExCreDqxlkyTgqf/+s/k1Z1kuYEKdRmk4MILVKGZvQARAQABtDFFY2xpcHNlIGhh -d2tCaXQgUHJvamVjdCA8aGF3a2JpdC1kZXZAZWNsaXBzZS5vcmc+iQEcBBABCAAGBQJX6nMW -AAoJEPqgpYKzPV/BDqEIAKAOy1JQjPccNwvZg8Y5OwW2QhB4lvq8ngzniSok/PAGdjsfVlJu -4zPgFkBcqgtAbXycOZXpMXQZBekfWslnDU7RtRAIZ6hJAuiJOL7qOOM3X03YHvq1HVWv2JK/ -g8NSoG1C2dw+GIsK2k4886QGX+a7pN7Mt0ZAbsVAaZx2Cig+iVc74+YW6UY6BiMOj1nGGSyG -9AT0pMgUWBbqvjpeKmiFzP5XVEL7e6pAS4jZAiYNp0xHPdYG/ANiq+hQAArmeaZa2hxOmygJ -CZvh6dYKBXMfRAQFBF8burVyhiJOV2Pn3kCxTSckaO63sZ+ayzBNrVu8Mpf0h2rIEGVVdWlx -KjyJARwEEAEIAAYFAlfrcXQACgkQZZoexg+SnXSfzQf7BWaH/x2yBzCmpbxpbUhI50bGvj6L -jasb6q68Q875ODwls9jve0ip0p7bcRwvbJ4Fd1OypwkxV3R/JdPlfkQwA4CoqHQpMOdN+iQ+ -aA8I86Z/dDL2yZS8e6cTdlRmIwC2RKAkNoy39t0P5UG3Zf6yiES0YaWB0zZQZwtBwNyOOPXD -1L2X/mKXT1yfLgc8YeBx+ojhr8LpzNZKA1vqyQ04YCYByMXy2FGqEaTHwbIZXFJ1IxIs956J -0SD929Nkw3m2/ZSONOLD0uMwb91A9lv9vRWU+bwp18S5j63N5NEEM6QsGOt9VgDhy01zdb46 -1e99V1IYkh863gCEHyJFOJi+RYkCHAQQAQgABgUCV+VPmAAKCRCforcpn1HlQ5VCD/9SxkSV -iV8sywK3cZm9lkYlnot33lAH/dYDf4md1mOf8vfNWTB0L9s5LOK9n6SWHdEKYd+f3OAP7ZM5 -Div30B/TmkyR4BgtMAkDOQSIR5+iEzXI2+iklEb1I+vhFVkKNOGoOaWRiDWZScWgwPBylYuj -iPjRAjKxtZuuhy5A4d6HkvdugoQ+4GdHeazkSeXLADz6XFBrQpUrTGCuNqdpE8QKkX4xmZ4L -Vvur3h/STBsJBfewuC4FhDTryFdd/vygivV7LrHzJlgTNqoK+oxL0wiietLtHvpwpS/gGcrq -a+8ccvPN+HhGCgpkeULEp8MUwp5fqoJxU57AZHUo/ER+6jmMSRz8V7M/VoZxwoGcH3o+paYw -GfxEPovaA6jadzEQomQTK3qsrx8nXflYPH39o3NYBM+MBLnsv6kndPqBb7OtBt2ZVges04zM -mbIYgpAUZgIOoCR75uU21DO2hbS7EHwd4nqY5vOfFSlMgtBcInjmXRiqDADspJv3938J/E2n -7M7ijERcQn6UmhCmdYLCLo2bAODp0mjjcftu6Ct65VLP1WRp95qr21VSDBoozwd9eL0AzAoC -SOhZPmDoeFoo3QcekEi4gxRtQvSdEZ0YteUENXmpSX+c/IKba5lpk4baC52HvhlNlmeu0DxX -VWqYF7O/9Z4hl2lQ5LHiSb2L0S1+6YkCPQQTAQgAJwUCV+VNbAIbLwUJCWYBgAULCQgHAwUV -CgkICwUWAgMBAAIeAQIXgAAKCRA4XLwcf2Z/rujfD/0Wp1uYXRsAzEcZavASh1Xe2301atbU -aRUy8UsNWO5oCvVjyyaPM4c3MT72sqsLyNXAWhi/MP63M0qr2+M0nN/91U8r98/Mbd+WlzRy -CLJYUX72Oqrfan+hZxcd7Xlu+sKHNshOlCy4114bVnrdq16LfeIAkx7GLw9/lMc9lRrvUwMI -684zhquROpuDD1aE/i/gBGgzd8cMoW+hdjFVA0zwe+6FgrWR2CMiKCJfeYWLuFiBNmFZC6l8 -BqiEqCuyQu6dFpWHhtK3fPJAEYIiNkORT8M3HSXl/Ex/w9ErweZKHiSja7KMAUWXkZi+Ayva -jMVI4jumXwgZW/7uuSc6bbv2SO4BSfMHvFtEuBSBWXi9e0urgqNOFQuKE7zokSbEStwG4+gN -E32ZuS2sllOxr41Nx/q2oKMeKePZBqoD5+3mDtRP432KWZjZjlhyez0Kh8aJ8lz5MM7Xxtzo -OyJeO4JHqbuBV82GvoLXVsYJBOUfRuBaZQcphUjamZwDZQFEvoKe6Ltur6+gsqu4UsQzs2bp -i26yaP3e1mrLc9Q5KAH7EkOr7wD3zo7jtJ21luGCBOtZ113oWJZgAwaevDC6cY/k32YgK8+q -iqMtNC7APznXyN4eVjKB18aSM7rVNdE8vlA818b7DbKXsqjH9N7VdiW2/4F8TJNq+OCVPjMf -pfM3KLkCDQRX6R/1ARAAplIU5GesaA42f8+idIEnozpd7aJKs8PuaOUUWr/7CmozpHNXpjPP -uPRflSRmFBeigp50xNfpLwYXjbjoVaiqdPKp6rxko0kh6NcG+pXYvCZOvWaM3e04xppREeiF -UNq8XctterVqWKC5zOgE1wY0346BgWtJvcYL9px71w2EE0bsZ/gwuphOYRblLtbmsKLwheMQ -JO2wfusPsAEGDdoaTRenEmosi/DRWt+oxodZSWygETk8fPESqcvmnjhPpVvCHksdIWEqUBXy -rg6NkkyIjLdMqeuBp/IrUN1XGBOrUgdVNpCNuiMN1Ai+6L9g364fLP7xYB84kLK+QSO03Bpv -j+D5Ca2DRweTmTaCQzaOeR2KW9kgf2tbLJbIoM2OiXLcfGN5bPvZVc2ODverOCRDiVwcVkd+ -sfbG3sUkyV+1NSYTJYTRnaNjsQmNGBfI0mI7v0zEHVt+X0tuJeP5QcMJ1lvLqBiZgZQDFVg4 -vtchDLFTv2JlLfsbyG+U2f2iLA3mauyFRS+x1ZFeIENsXwSqLn1WXvslnkV8cTs4hTFb1Skj -zC89XbjY2PUJMg2XWLeWjvv6pVGvdRVlPuujbou93SMfPSdYPqOrX4eX42I66GXuXMczbu9H -F8kk7OpyP9cYo8LpiHjuxHm/VMFLckagluXwZCl6uiIRB+IJJmd+2jcAEQEAAYkERAQYAQgA -DwUCV+kf9QIbAgUJCWYBgAIpCRA4XLwcf2Z/rsFdIAQZAQgABgUCV+kf9QAKCRBjMbgT6Sl8 -4NSbD/9ueOFntw+rs2q7hAGOq2LP3D/d7SuU+j8vUcszJK2ETQlKX9IcQs3c+T4AbpQ4O5Ea -EvvYEAVmPjosk9zn7sxiWrzvDbvfhQK6hR6zbBK2LB7yTkzBh3oT8WghbCqeTDqJMl47PUv5 -yUVsX4RHmbgo7qymRGiPJ8a+5QPOmtmdoyaEv0hGvszya4aTKexLM4fU+k+e8kupY9fTICE7 -S7zUpX7hpFYC4d/uk3KUkCvebox2C4UomT2kV518/Pnj/6wpWQ3GHnqIurMPOW097VsP3epl -jutNwXM3sH6rbgiiZqdQFb3bq1Da4fpNqnH6Rdm7fSjjV2R36qDrPQz/AfZC2fouq2Xbse6M -RKR48peb80cvtGqhc2J7FHWfEu8da/26Gxq07SOod9svR8eBcJAnlCd3Hca0T2qmaM52WvC+ -Mjxsjgg6yGh0PenjsNQM2mdhvKUflqbLluY4E2QPHVJZlT3Bo5LekM91ZZAgd4F3xBE25/WL -Akg2/rsCiulAfaEXAPQkqCaB7ajd9dvJXcq5qvWSvSgW5vL/nnyecE5ktf8todaMhMz83gpt -eXtR8Ms7401d2Qwt28NifXkgEMMNfytXg/0TO6F0uRGi67SoAeadUjug2JSr7LBmeQHyOvLR -q+0iO1m3f3pSSduqBjKWUFnJShED8FafaRUrE1+HWN2lD/0Sci1X33CrTXNSQCzdTaD3R/SJ -B+BSspEQNV/JqAPjJD9ZK3dwDm5upmrjpFNjSVvcQJoy0J1rW2q2E8y8ECuxErUWQqyFv/Co -y39WpwgWam19ykP3yNiU9UHGb58DhuMRwLOYF7o5Iwg2nbiYtHO5jSmC3PPpYz3TLvA/kSTK -1T1m6ac2dA6UMLn3t3Cohv50wpr41bxLz04ig/dEmrdP72HRpA5oNoXAXCaCeeed5R1DfxgW -RL2fP+GL6ZftTplw3AL2trJa+0zLFHvDo+M4c1brM2x0HYEoX+qSpFMxtixgV0D5Uf7RUMkN -eYPb4SZRc6wDHIt7Wqp/qlUozC94DKbFUrK4UnHyK4+HVlSQJGevqm+Y+QoqIBcnhOEN0Bzo -01aVHIZFxzk4R2bppFEDiFEw1zL2DAPj/xX7Zqrjsg/qdVu9bUklBxir6QSOwZGZMGYCuBWM -uJU3IY7Xzx/6Anm5oqbXLVLwVFwS8tED+/XYjPUo1ifLGVx96THuQrNBMhpwNE/9Qd4zbjnE -7f6foXLgeB/l2h65zrI6O1RdEAUpA8Tuhgy0PwNc/1mviaOkYx9qFlhyjruTd72TV4va+5Qb -L7wnh417OQNbpWUqb5HvN5BruDFQOBztFupi/7LHWnSX4XVO777SYzlf1a7DdJu45cql44d2 -LrdPYOGtAA== -=a0Oj ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.3.0M3-mysql/Dockerfile b/hawkbit-runtime/docker/0.3.0M3-mysql/Dockerfile deleted file mode 100644 index 8566e37fc7..0000000000 --- a/hawkbit-runtime/docker/0.3.0M3-mysql/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM hawkbit/hawkbit-update-server:0.3.0M3 - -ENV MARIADB_DRIVER_VERSION=2.4.1 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose https://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose https://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ - && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \ - && apk del build-dependencies - -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.3.0M3-mysql/KEY b/hawkbit-runtime/docker/0.3.0M3-mysql/KEY deleted file mode 100644 index 4c602ae045..0000000000 --- a/hawkbit-runtime/docker/0.3.0M3-mysql/KEY +++ /dev/null @@ -1,40 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQENBFSTDbABCADuZ2k4NIsmhrSyAw/49GQugqPF40P0ldkTPkKDx8b6eNFtPFJbsyw9yKqU -EIS+9eFtIEMLLR4CIHMM56adZe5q5Wp7g/+rnHgTuefVWfMg42Vaxdk8lTQIN2Z3gSsj36DZ -TtO+SmxixFfxHb2YESUvgVzeWIaFBKZCV4JdumniI02RCAPuqxIHKYmhwuqQSpzIAuZQEVvM -qSwFBUOr+CSf3+YzQ/PmFqldlQOQKbSE6G2H7E1mMhRBI07uryo1gDSM42DSFcZ+eQCzCHQr -CNC+2TtBrPkmPNU7TpngtjBthjwF/qJVVX8/q+syv524E1MtO+uXwf4PvrFJ537SkfdHABEB -AAG0OE1hcmlhREIgRW50ZXJwcmlzZSBTaWduaW5nIEtleSA8c2lnbmluZy1rZXlAbWFyaWFk -Yi5jb20+iEYEEhEIAAYFAlTeJRQACgkQy8sIKhu5Q9tQ8wCfXu/gtMah1J9a+CB1RDKt2s4C -alIAn0LqQcsEib4zrHgBeMwp6Wvre/qZiQE4BBMBAgAiBQJUkw2wAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRDOGj3V48lPSbWuCACnykjC688qarR5aCJOkjQVruc+3GaM/8Mk -8sXT8GZisJyTott6o++tdjx4GLvnBZFssLDfnZwza9rS79GJAdHqshk4t6V8GqTK8OG2IHJk -XKG0xASUTWV3+oLA2Dbw4ILmgWZxncHTnmEx+x2DGUWTshfwrqBMFy0ksKjeWMnFSzOgbTRW -1Z7z3U4cm8dZWNAD6bNQbZBaXDUk/FOTFpGwXqB7DR/y6AMpJq2i+orD0gTW5yhdSsMasHpP -5YCcztONl9Ft08EggkzhwQSzdP+R0eI6uf/wnB9G2nkGQxHsXe1oc1UqOEQpdJgPhEv4lkFP -4izB1Ix/x4YjhlkXZqGziQIcBBIBCAAGBQJU3iVrAAoJEJFxGJmV5FqejVIP/0Qm+CWS+UZ9 -39wUkV/kvfbvhCiVMQmtJDWUJVWRYDXZsfxgdAs4RaKlIrvXShUbWSrGCPwLJkg+FBjXpXqy -/1Qf/TXHrlGGDTZ+SUOfU4O0+HKNqjGdQf3yZdJzoMySY0HdE7eob74ITqnZVjL/bZXsJzZi -xxkqhXZxHi4ToHJkDE75rO2kjYXpaOdg90MiS2nvJm9pexnVvLWIfsPYfkxHaJ3WV+HOZixT -MYKtgiPG6ebiYdOTdbfY8d7uHIxoaqiednBqjpMGygb+YL3SYOWi/rj6LzLs4Z8ISM2OJg01 -2DYL6bsIkHWbf0EcuSVdZ4o5l8V+Z055KI3vRwFadU/fpBHvV1EuXcQNOgKvc19KnoG2RIMQ -/aGVekwzbxqunY2syuQjTEycJPJ02c4r0+o31ge+BQl0K8gmn3F2geS+JqjKNXdJtLYzH3bw -upKKsXmacOUAzyM+ic5BtYkDWiNAxy9Az2OxunXjeFnBjVxJxqVbSbZMlziT1I8I8QHtNNzg -yhd3rmTU3w0oQiVM7XmGPeat09QW8/ift/ABN4t0RdVCTyBtdrzUsI/eIb8NOBLw0gkAgyNe -jiMb8H4WGd4CggA9TGmN/OOpDd0PWSWWR+05oU5LeJAAuWdqSUWGr8qiAXWSnv9Jg9y0SC2C -D7XV0eudrAy94uqeooeVh+x8iQIcBBIBCAAGBQJV8eBgAAoJEEHdwLQNpW8iwDIP/RDSgy1S -43q6SMmJiOyok+kqTBaGKNqouN3TV7vual8sS77vpe/o3sr9SrcAsdiFf4Rq81aJ61ZwJ5JI -0ZnhfJhSOo/3CJiLHsQ/XH1hurmjS0VRtYiZDe8lbLHhPWJsnC96LyPrg4pHCF8SH/XmUN9F -rqq3izeezh1fOsxjPwLixtzaf3yoQI6JzFq+ENzs0PB7JzYnrcO8oGrtVdRJUQIHg3B7Kq0B -c4rc4QPNFxPTxXfQiQtkTzkJHc8I956WFkcxnXxcEJXYdre3LVBnlNkQmvyT48Z5z/jZmBWf -NFqHvndFhGgPMrlgzuMjiEnvjx1jbk2dxQNC/Ugfq2PfTsng8rsjtLTaPoSV/csfCM3Thimm -Wcs1tqfMb9q2uFRG+kR9o8w+3TY5SkY611YqSWpBcAghixOaEGrcyDwBARVZDEEfzyWCqSEd -eQsUrsNYhAiVYI+ubYNKO9rtI+SZi5EtD5nwSKLNZFwDxvRX9PIbaT2vsRNzjqeMOkpjDg7S -79lMicr7idOon4dpLl411HpClV8MnuWmekAa/L9Ee52J50ti3Rx7MDgPISJi9ZykqpPrxmt1 -A+9ZkKE6VB63nTMBOpLUh0zD4yFHYjAUyDpSTH3SLNtVu3UfkLJ+Nr7AAKoV9YQgTmu3wSPR -FsnHsQksxFhCqGYdUKyfRsobs/Ns -=ovQp ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.3.0M3/Dockerfile b/hawkbit-runtime/docker/0.3.0M3/Dockerfile deleted file mode 100644 index a1f06b606d..0000000000 --- a/hawkbit-runtime/docker/0.3.0M3/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM openjdk:8u201-jre-alpine - -ENV HAWKBIT_VERSION=0.3.0M3 \ - HAWKBIT_HOME=/opt/hawkbit - -EXPOSE 8080 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && mkdir -p $HAWKBIT_HOME \ - && cd $HAWKBIT_HOME \ - && wget -O hawkbit-update-server.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ - && wget -O hawkbit-update-server.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ - && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar \ - && apk del build-dependencies - -VOLUME "$HAWKBIT_HOME/data" - -WORKDIR $HAWKBIT_HOME -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.3.0M3/KEY b/hawkbit-runtime/docker/0.3.0M3/KEY deleted file mode 100644 index 7a959f646d..0000000000 --- a/hawkbit-runtime/docker/0.3.0M3/KEY +++ /dev/null @@ -1,79 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQINBFflTWwBEAC9YoTvzZlCcQSrqPdovEmAlxlIKzPqE+06Pig87dcn+2PJDDnk9Rl9eDEH -CWKrds4mg7lVgzFApI73V7agHj9bqSyPWbp1GtReDvD4QKNEb4RM9XY8O1rStOTrznhfVIGc -oi9wKPTQWk5GXiqh6rawiyZnAfKm9WPZhKaxIi4m0zcTpJQ2dwbPi0hBpeEMJTyadId4Y+bB -AmH2qGKCOi2NXQDGDJ9BOkjLMVmPlgxnj8QBgZlUgRnVkYNjas/eVcXM5w6BQ884vUuSm35r -PelQOflmUAUiCGoE7UAhfrJdd5tOdWbn9bnCjv1eUyj2hJwJRRwRZjHvsvJygEg7T00Ntur3 -UN8fich29cjPGzjkilqK1NkRPZGROchn5MDhSoeUpGXEDL5bPAWHCNLqus6gMx5vNJ2IuNmW -rHSlsNy0pkWu88xtanjZjgX416nY7RPsmvZ1WRr04tegYB2CGO5aQWK1l+k6ciXWLqC23SAg -FE/2Edbzaxvc6jJi5cVGvvZAoH8J7wXCF0zFwORypNyXbNoiAQQnlW7LBJtJU6KihkuTjbDJ -1wmphLIdMoPTXLOxVVBTM7rsYa3ev9o9V9Z0dkAv364fO7zc/RpEoqM33NmNTzS8DUP/TF6J -UQftNJL+ExCreDqxlkyTgqf/+s/k1Z1kuYEKdRmk4MILVKGZvQARAQABtDFFY2xpcHNlIGhh -d2tCaXQgUHJvamVjdCA8aGF3a2JpdC1kZXZAZWNsaXBzZS5vcmc+iQEcBBABCAAGBQJX6nMW -AAoJEPqgpYKzPV/BDqEIAKAOy1JQjPccNwvZg8Y5OwW2QhB4lvq8ngzniSok/PAGdjsfVlJu -4zPgFkBcqgtAbXycOZXpMXQZBekfWslnDU7RtRAIZ6hJAuiJOL7qOOM3X03YHvq1HVWv2JK/ -g8NSoG1C2dw+GIsK2k4886QGX+a7pN7Mt0ZAbsVAaZx2Cig+iVc74+YW6UY6BiMOj1nGGSyG -9AT0pMgUWBbqvjpeKmiFzP5XVEL7e6pAS4jZAiYNp0xHPdYG/ANiq+hQAArmeaZa2hxOmygJ -CZvh6dYKBXMfRAQFBF8burVyhiJOV2Pn3kCxTSckaO63sZ+ayzBNrVu8Mpf0h2rIEGVVdWlx -KjyJARwEEAEIAAYFAlfrcXQACgkQZZoexg+SnXSfzQf7BWaH/x2yBzCmpbxpbUhI50bGvj6L -jasb6q68Q875ODwls9jve0ip0p7bcRwvbJ4Fd1OypwkxV3R/JdPlfkQwA4CoqHQpMOdN+iQ+ -aA8I86Z/dDL2yZS8e6cTdlRmIwC2RKAkNoy39t0P5UG3Zf6yiES0YaWB0zZQZwtBwNyOOPXD -1L2X/mKXT1yfLgc8YeBx+ojhr8LpzNZKA1vqyQ04YCYByMXy2FGqEaTHwbIZXFJ1IxIs956J -0SD929Nkw3m2/ZSONOLD0uMwb91A9lv9vRWU+bwp18S5j63N5NEEM6QsGOt9VgDhy01zdb46 -1e99V1IYkh863gCEHyJFOJi+RYkCHAQQAQgABgUCV+VPmAAKCRCforcpn1HlQ5VCD/9SxkSV -iV8sywK3cZm9lkYlnot33lAH/dYDf4md1mOf8vfNWTB0L9s5LOK9n6SWHdEKYd+f3OAP7ZM5 -Div30B/TmkyR4BgtMAkDOQSIR5+iEzXI2+iklEb1I+vhFVkKNOGoOaWRiDWZScWgwPBylYuj -iPjRAjKxtZuuhy5A4d6HkvdugoQ+4GdHeazkSeXLADz6XFBrQpUrTGCuNqdpE8QKkX4xmZ4L -Vvur3h/STBsJBfewuC4FhDTryFdd/vygivV7LrHzJlgTNqoK+oxL0wiietLtHvpwpS/gGcrq -a+8ccvPN+HhGCgpkeULEp8MUwp5fqoJxU57AZHUo/ER+6jmMSRz8V7M/VoZxwoGcH3o+paYw -GfxEPovaA6jadzEQomQTK3qsrx8nXflYPH39o3NYBM+MBLnsv6kndPqBb7OtBt2ZVges04zM -mbIYgpAUZgIOoCR75uU21DO2hbS7EHwd4nqY5vOfFSlMgtBcInjmXRiqDADspJv3938J/E2n -7M7ijERcQn6UmhCmdYLCLo2bAODp0mjjcftu6Ct65VLP1WRp95qr21VSDBoozwd9eL0AzAoC -SOhZPmDoeFoo3QcekEi4gxRtQvSdEZ0YteUENXmpSX+c/IKba5lpk4baC52HvhlNlmeu0DxX -VWqYF7O/9Z4hl2lQ5LHiSb2L0S1+6YkCPQQTAQgAJwUCV+VNbAIbLwUJCWYBgAULCQgHAwUV -CgkICwUWAgMBAAIeAQIXgAAKCRA4XLwcf2Z/rujfD/0Wp1uYXRsAzEcZavASh1Xe2301atbU -aRUy8UsNWO5oCvVjyyaPM4c3MT72sqsLyNXAWhi/MP63M0qr2+M0nN/91U8r98/Mbd+WlzRy -CLJYUX72Oqrfan+hZxcd7Xlu+sKHNshOlCy4114bVnrdq16LfeIAkx7GLw9/lMc9lRrvUwMI -684zhquROpuDD1aE/i/gBGgzd8cMoW+hdjFVA0zwe+6FgrWR2CMiKCJfeYWLuFiBNmFZC6l8 -BqiEqCuyQu6dFpWHhtK3fPJAEYIiNkORT8M3HSXl/Ex/w9ErweZKHiSja7KMAUWXkZi+Ayva -jMVI4jumXwgZW/7uuSc6bbv2SO4BSfMHvFtEuBSBWXi9e0urgqNOFQuKE7zokSbEStwG4+gN -E32ZuS2sllOxr41Nx/q2oKMeKePZBqoD5+3mDtRP432KWZjZjlhyez0Kh8aJ8lz5MM7Xxtzo -OyJeO4JHqbuBV82GvoLXVsYJBOUfRuBaZQcphUjamZwDZQFEvoKe6Ltur6+gsqu4UsQzs2bp -i26yaP3e1mrLc9Q5KAH7EkOr7wD3zo7jtJ21luGCBOtZ113oWJZgAwaevDC6cY/k32YgK8+q -iqMtNC7APznXyN4eVjKB18aSM7rVNdE8vlA818b7DbKXsqjH9N7VdiW2/4F8TJNq+OCVPjMf -pfM3KLkCDQRX6R/1ARAAplIU5GesaA42f8+idIEnozpd7aJKs8PuaOUUWr/7CmozpHNXpjPP -uPRflSRmFBeigp50xNfpLwYXjbjoVaiqdPKp6rxko0kh6NcG+pXYvCZOvWaM3e04xppREeiF -UNq8XctterVqWKC5zOgE1wY0346BgWtJvcYL9px71w2EE0bsZ/gwuphOYRblLtbmsKLwheMQ -JO2wfusPsAEGDdoaTRenEmosi/DRWt+oxodZSWygETk8fPESqcvmnjhPpVvCHksdIWEqUBXy -rg6NkkyIjLdMqeuBp/IrUN1XGBOrUgdVNpCNuiMN1Ai+6L9g364fLP7xYB84kLK+QSO03Bpv -j+D5Ca2DRweTmTaCQzaOeR2KW9kgf2tbLJbIoM2OiXLcfGN5bPvZVc2ODverOCRDiVwcVkd+ -sfbG3sUkyV+1NSYTJYTRnaNjsQmNGBfI0mI7v0zEHVt+X0tuJeP5QcMJ1lvLqBiZgZQDFVg4 -vtchDLFTv2JlLfsbyG+U2f2iLA3mauyFRS+x1ZFeIENsXwSqLn1WXvslnkV8cTs4hTFb1Skj -zC89XbjY2PUJMg2XWLeWjvv6pVGvdRVlPuujbou93SMfPSdYPqOrX4eX42I66GXuXMczbu9H -F8kk7OpyP9cYo8LpiHjuxHm/VMFLckagluXwZCl6uiIRB+IJJmd+2jcAEQEAAYkERAQYAQgA -DwUCV+kf9QIbAgUJCWYBgAIpCRA4XLwcf2Z/rsFdIAQZAQgABgUCV+kf9QAKCRBjMbgT6Sl8 -4NSbD/9ueOFntw+rs2q7hAGOq2LP3D/d7SuU+j8vUcszJK2ETQlKX9IcQs3c+T4AbpQ4O5Ea -EvvYEAVmPjosk9zn7sxiWrzvDbvfhQK6hR6zbBK2LB7yTkzBh3oT8WghbCqeTDqJMl47PUv5 -yUVsX4RHmbgo7qymRGiPJ8a+5QPOmtmdoyaEv0hGvszya4aTKexLM4fU+k+e8kupY9fTICE7 -S7zUpX7hpFYC4d/uk3KUkCvebox2C4UomT2kV518/Pnj/6wpWQ3GHnqIurMPOW097VsP3epl -jutNwXM3sH6rbgiiZqdQFb3bq1Da4fpNqnH6Rdm7fSjjV2R36qDrPQz/AfZC2fouq2Xbse6M -RKR48peb80cvtGqhc2J7FHWfEu8da/26Gxq07SOod9svR8eBcJAnlCd3Hca0T2qmaM52WvC+ -Mjxsjgg6yGh0PenjsNQM2mdhvKUflqbLluY4E2QPHVJZlT3Bo5LekM91ZZAgd4F3xBE25/WL -Akg2/rsCiulAfaEXAPQkqCaB7ajd9dvJXcq5qvWSvSgW5vL/nnyecE5ktf8todaMhMz83gpt -eXtR8Ms7401d2Qwt28NifXkgEMMNfytXg/0TO6F0uRGi67SoAeadUjug2JSr7LBmeQHyOvLR -q+0iO1m3f3pSSduqBjKWUFnJShED8FafaRUrE1+HWN2lD/0Sci1X33CrTXNSQCzdTaD3R/SJ -B+BSspEQNV/JqAPjJD9ZK3dwDm5upmrjpFNjSVvcQJoy0J1rW2q2E8y8ECuxErUWQqyFv/Co -y39WpwgWam19ykP3yNiU9UHGb58DhuMRwLOYF7o5Iwg2nbiYtHO5jSmC3PPpYz3TLvA/kSTK -1T1m6ac2dA6UMLn3t3Cohv50wpr41bxLz04ig/dEmrdP72HRpA5oNoXAXCaCeeed5R1DfxgW -RL2fP+GL6ZftTplw3AL2trJa+0zLFHvDo+M4c1brM2x0HYEoX+qSpFMxtixgV0D5Uf7RUMkN -eYPb4SZRc6wDHIt7Wqp/qlUozC94DKbFUrK4UnHyK4+HVlSQJGevqm+Y+QoqIBcnhOEN0Bzo -01aVHIZFxzk4R2bppFEDiFEw1zL2DAPj/xX7Zqrjsg/qdVu9bUklBxir6QSOwZGZMGYCuBWM -uJU3IY7Xzx/6Anm5oqbXLVLwVFwS8tED+/XYjPUo1ifLGVx96THuQrNBMhpwNE/9Qd4zbjnE -7f6foXLgeB/l2h65zrI6O1RdEAUpA8Tuhgy0PwNc/1mviaOkYx9qFlhyjruTd72TV4va+5Qb -L7wnh417OQNbpWUqb5HvN5BruDFQOBztFupi/7LHWnSX4XVO777SYzlf1a7DdJu45cql44d2 -LrdPYOGtAA== -=a0Oj ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.3.0M4-mysql/Dockerfile b/hawkbit-runtime/docker/0.3.0M4-mysql/Dockerfile deleted file mode 100644 index f0676d9789..0000000000 --- a/hawkbit-runtime/docker/0.3.0M4-mysql/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM hawkbit/hawkbit-update-server:0.3.0M4 - -ENV MARIADB_DRIVER_VERSION=2.4.2 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose https://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose https://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ - && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \ - && apk del build-dependencies - -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.3.0M4-mysql/KEY b/hawkbit-runtime/docker/0.3.0M4-mysql/KEY deleted file mode 100644 index 4c602ae045..0000000000 --- a/hawkbit-runtime/docker/0.3.0M4-mysql/KEY +++ /dev/null @@ -1,40 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQENBFSTDbABCADuZ2k4NIsmhrSyAw/49GQugqPF40P0ldkTPkKDx8b6eNFtPFJbsyw9yKqU -EIS+9eFtIEMLLR4CIHMM56adZe5q5Wp7g/+rnHgTuefVWfMg42Vaxdk8lTQIN2Z3gSsj36DZ -TtO+SmxixFfxHb2YESUvgVzeWIaFBKZCV4JdumniI02RCAPuqxIHKYmhwuqQSpzIAuZQEVvM -qSwFBUOr+CSf3+YzQ/PmFqldlQOQKbSE6G2H7E1mMhRBI07uryo1gDSM42DSFcZ+eQCzCHQr -CNC+2TtBrPkmPNU7TpngtjBthjwF/qJVVX8/q+syv524E1MtO+uXwf4PvrFJ537SkfdHABEB -AAG0OE1hcmlhREIgRW50ZXJwcmlzZSBTaWduaW5nIEtleSA8c2lnbmluZy1rZXlAbWFyaWFk -Yi5jb20+iEYEEhEIAAYFAlTeJRQACgkQy8sIKhu5Q9tQ8wCfXu/gtMah1J9a+CB1RDKt2s4C -alIAn0LqQcsEib4zrHgBeMwp6Wvre/qZiQE4BBMBAgAiBQJUkw2wAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRDOGj3V48lPSbWuCACnykjC688qarR5aCJOkjQVruc+3GaM/8Mk -8sXT8GZisJyTott6o++tdjx4GLvnBZFssLDfnZwza9rS79GJAdHqshk4t6V8GqTK8OG2IHJk -XKG0xASUTWV3+oLA2Dbw4ILmgWZxncHTnmEx+x2DGUWTshfwrqBMFy0ksKjeWMnFSzOgbTRW -1Z7z3U4cm8dZWNAD6bNQbZBaXDUk/FOTFpGwXqB7DR/y6AMpJq2i+orD0gTW5yhdSsMasHpP -5YCcztONl9Ft08EggkzhwQSzdP+R0eI6uf/wnB9G2nkGQxHsXe1oc1UqOEQpdJgPhEv4lkFP -4izB1Ix/x4YjhlkXZqGziQIcBBIBCAAGBQJU3iVrAAoJEJFxGJmV5FqejVIP/0Qm+CWS+UZ9 -39wUkV/kvfbvhCiVMQmtJDWUJVWRYDXZsfxgdAs4RaKlIrvXShUbWSrGCPwLJkg+FBjXpXqy -/1Qf/TXHrlGGDTZ+SUOfU4O0+HKNqjGdQf3yZdJzoMySY0HdE7eob74ITqnZVjL/bZXsJzZi -xxkqhXZxHi4ToHJkDE75rO2kjYXpaOdg90MiS2nvJm9pexnVvLWIfsPYfkxHaJ3WV+HOZixT -MYKtgiPG6ebiYdOTdbfY8d7uHIxoaqiednBqjpMGygb+YL3SYOWi/rj6LzLs4Z8ISM2OJg01 -2DYL6bsIkHWbf0EcuSVdZ4o5l8V+Z055KI3vRwFadU/fpBHvV1EuXcQNOgKvc19KnoG2RIMQ -/aGVekwzbxqunY2syuQjTEycJPJ02c4r0+o31ge+BQl0K8gmn3F2geS+JqjKNXdJtLYzH3bw -upKKsXmacOUAzyM+ic5BtYkDWiNAxy9Az2OxunXjeFnBjVxJxqVbSbZMlziT1I8I8QHtNNzg -yhd3rmTU3w0oQiVM7XmGPeat09QW8/ift/ABN4t0RdVCTyBtdrzUsI/eIb8NOBLw0gkAgyNe -jiMb8H4WGd4CggA9TGmN/OOpDd0PWSWWR+05oU5LeJAAuWdqSUWGr8qiAXWSnv9Jg9y0SC2C -D7XV0eudrAy94uqeooeVh+x8iQIcBBIBCAAGBQJV8eBgAAoJEEHdwLQNpW8iwDIP/RDSgy1S -43q6SMmJiOyok+kqTBaGKNqouN3TV7vual8sS77vpe/o3sr9SrcAsdiFf4Rq81aJ61ZwJ5JI -0ZnhfJhSOo/3CJiLHsQ/XH1hurmjS0VRtYiZDe8lbLHhPWJsnC96LyPrg4pHCF8SH/XmUN9F -rqq3izeezh1fOsxjPwLixtzaf3yoQI6JzFq+ENzs0PB7JzYnrcO8oGrtVdRJUQIHg3B7Kq0B -c4rc4QPNFxPTxXfQiQtkTzkJHc8I956WFkcxnXxcEJXYdre3LVBnlNkQmvyT48Z5z/jZmBWf -NFqHvndFhGgPMrlgzuMjiEnvjx1jbk2dxQNC/Ugfq2PfTsng8rsjtLTaPoSV/csfCM3Thimm -Wcs1tqfMb9q2uFRG+kR9o8w+3TY5SkY611YqSWpBcAghixOaEGrcyDwBARVZDEEfzyWCqSEd -eQsUrsNYhAiVYI+ubYNKO9rtI+SZi5EtD5nwSKLNZFwDxvRX9PIbaT2vsRNzjqeMOkpjDg7S -79lMicr7idOon4dpLl411HpClV8MnuWmekAa/L9Ee52J50ti3Rx7MDgPISJi9ZykqpPrxmt1 -A+9ZkKE6VB63nTMBOpLUh0zD4yFHYjAUyDpSTH3SLNtVu3UfkLJ+Nr7AAKoV9YQgTmu3wSPR -FsnHsQksxFhCqGYdUKyfRsobs/Ns -=ovQp ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.3.0M4/Dockerfile b/hawkbit-runtime/docker/0.3.0M4/Dockerfile deleted file mode 100644 index 63b24a5083..0000000000 --- a/hawkbit-runtime/docker/0.3.0M4/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM openjdk:8u201-jre-alpine - -ENV HAWKBIT_VERSION=0.3.0M4 \ - HAWKBIT_HOME=/opt/hawkbit - -EXPOSE 8080 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && mkdir -p $HAWKBIT_HOME \ - && cd $HAWKBIT_HOME \ - && wget -O hawkbit-update-server.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ - && wget -O hawkbit-update-server.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ - && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar \ - && apk del build-dependencies - -VOLUME "$HAWKBIT_HOME/data" - -WORKDIR $HAWKBIT_HOME -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.3.0M4/KEY b/hawkbit-runtime/docker/0.3.0M4/KEY deleted file mode 100644 index 7a959f646d..0000000000 --- a/hawkbit-runtime/docker/0.3.0M4/KEY +++ /dev/null @@ -1,79 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQINBFflTWwBEAC9YoTvzZlCcQSrqPdovEmAlxlIKzPqE+06Pig87dcn+2PJDDnk9Rl9eDEH -CWKrds4mg7lVgzFApI73V7agHj9bqSyPWbp1GtReDvD4QKNEb4RM9XY8O1rStOTrznhfVIGc -oi9wKPTQWk5GXiqh6rawiyZnAfKm9WPZhKaxIi4m0zcTpJQ2dwbPi0hBpeEMJTyadId4Y+bB -AmH2qGKCOi2NXQDGDJ9BOkjLMVmPlgxnj8QBgZlUgRnVkYNjas/eVcXM5w6BQ884vUuSm35r -PelQOflmUAUiCGoE7UAhfrJdd5tOdWbn9bnCjv1eUyj2hJwJRRwRZjHvsvJygEg7T00Ntur3 -UN8fich29cjPGzjkilqK1NkRPZGROchn5MDhSoeUpGXEDL5bPAWHCNLqus6gMx5vNJ2IuNmW -rHSlsNy0pkWu88xtanjZjgX416nY7RPsmvZ1WRr04tegYB2CGO5aQWK1l+k6ciXWLqC23SAg -FE/2Edbzaxvc6jJi5cVGvvZAoH8J7wXCF0zFwORypNyXbNoiAQQnlW7LBJtJU6KihkuTjbDJ -1wmphLIdMoPTXLOxVVBTM7rsYa3ev9o9V9Z0dkAv364fO7zc/RpEoqM33NmNTzS8DUP/TF6J -UQftNJL+ExCreDqxlkyTgqf/+s/k1Z1kuYEKdRmk4MILVKGZvQARAQABtDFFY2xpcHNlIGhh -d2tCaXQgUHJvamVjdCA8aGF3a2JpdC1kZXZAZWNsaXBzZS5vcmc+iQEcBBABCAAGBQJX6nMW -AAoJEPqgpYKzPV/BDqEIAKAOy1JQjPccNwvZg8Y5OwW2QhB4lvq8ngzniSok/PAGdjsfVlJu -4zPgFkBcqgtAbXycOZXpMXQZBekfWslnDU7RtRAIZ6hJAuiJOL7qOOM3X03YHvq1HVWv2JK/ -g8NSoG1C2dw+GIsK2k4886QGX+a7pN7Mt0ZAbsVAaZx2Cig+iVc74+YW6UY6BiMOj1nGGSyG -9AT0pMgUWBbqvjpeKmiFzP5XVEL7e6pAS4jZAiYNp0xHPdYG/ANiq+hQAArmeaZa2hxOmygJ -CZvh6dYKBXMfRAQFBF8burVyhiJOV2Pn3kCxTSckaO63sZ+ayzBNrVu8Mpf0h2rIEGVVdWlx -KjyJARwEEAEIAAYFAlfrcXQACgkQZZoexg+SnXSfzQf7BWaH/x2yBzCmpbxpbUhI50bGvj6L -jasb6q68Q875ODwls9jve0ip0p7bcRwvbJ4Fd1OypwkxV3R/JdPlfkQwA4CoqHQpMOdN+iQ+ -aA8I86Z/dDL2yZS8e6cTdlRmIwC2RKAkNoy39t0P5UG3Zf6yiES0YaWB0zZQZwtBwNyOOPXD -1L2X/mKXT1yfLgc8YeBx+ojhr8LpzNZKA1vqyQ04YCYByMXy2FGqEaTHwbIZXFJ1IxIs956J -0SD929Nkw3m2/ZSONOLD0uMwb91A9lv9vRWU+bwp18S5j63N5NEEM6QsGOt9VgDhy01zdb46 -1e99V1IYkh863gCEHyJFOJi+RYkCHAQQAQgABgUCV+VPmAAKCRCforcpn1HlQ5VCD/9SxkSV -iV8sywK3cZm9lkYlnot33lAH/dYDf4md1mOf8vfNWTB0L9s5LOK9n6SWHdEKYd+f3OAP7ZM5 -Div30B/TmkyR4BgtMAkDOQSIR5+iEzXI2+iklEb1I+vhFVkKNOGoOaWRiDWZScWgwPBylYuj -iPjRAjKxtZuuhy5A4d6HkvdugoQ+4GdHeazkSeXLADz6XFBrQpUrTGCuNqdpE8QKkX4xmZ4L -Vvur3h/STBsJBfewuC4FhDTryFdd/vygivV7LrHzJlgTNqoK+oxL0wiietLtHvpwpS/gGcrq -a+8ccvPN+HhGCgpkeULEp8MUwp5fqoJxU57AZHUo/ER+6jmMSRz8V7M/VoZxwoGcH3o+paYw -GfxEPovaA6jadzEQomQTK3qsrx8nXflYPH39o3NYBM+MBLnsv6kndPqBb7OtBt2ZVges04zM -mbIYgpAUZgIOoCR75uU21DO2hbS7EHwd4nqY5vOfFSlMgtBcInjmXRiqDADspJv3938J/E2n -7M7ijERcQn6UmhCmdYLCLo2bAODp0mjjcftu6Ct65VLP1WRp95qr21VSDBoozwd9eL0AzAoC -SOhZPmDoeFoo3QcekEi4gxRtQvSdEZ0YteUENXmpSX+c/IKba5lpk4baC52HvhlNlmeu0DxX -VWqYF7O/9Z4hl2lQ5LHiSb2L0S1+6YkCPQQTAQgAJwUCV+VNbAIbLwUJCWYBgAULCQgHAwUV -CgkICwUWAgMBAAIeAQIXgAAKCRA4XLwcf2Z/rujfD/0Wp1uYXRsAzEcZavASh1Xe2301atbU -aRUy8UsNWO5oCvVjyyaPM4c3MT72sqsLyNXAWhi/MP63M0qr2+M0nN/91U8r98/Mbd+WlzRy -CLJYUX72Oqrfan+hZxcd7Xlu+sKHNshOlCy4114bVnrdq16LfeIAkx7GLw9/lMc9lRrvUwMI -684zhquROpuDD1aE/i/gBGgzd8cMoW+hdjFVA0zwe+6FgrWR2CMiKCJfeYWLuFiBNmFZC6l8 -BqiEqCuyQu6dFpWHhtK3fPJAEYIiNkORT8M3HSXl/Ex/w9ErweZKHiSja7KMAUWXkZi+Ayva -jMVI4jumXwgZW/7uuSc6bbv2SO4BSfMHvFtEuBSBWXi9e0urgqNOFQuKE7zokSbEStwG4+gN -E32ZuS2sllOxr41Nx/q2oKMeKePZBqoD5+3mDtRP432KWZjZjlhyez0Kh8aJ8lz5MM7Xxtzo -OyJeO4JHqbuBV82GvoLXVsYJBOUfRuBaZQcphUjamZwDZQFEvoKe6Ltur6+gsqu4UsQzs2bp -i26yaP3e1mrLc9Q5KAH7EkOr7wD3zo7jtJ21luGCBOtZ113oWJZgAwaevDC6cY/k32YgK8+q -iqMtNC7APznXyN4eVjKB18aSM7rVNdE8vlA818b7DbKXsqjH9N7VdiW2/4F8TJNq+OCVPjMf -pfM3KLkCDQRX6R/1ARAAplIU5GesaA42f8+idIEnozpd7aJKs8PuaOUUWr/7CmozpHNXpjPP -uPRflSRmFBeigp50xNfpLwYXjbjoVaiqdPKp6rxko0kh6NcG+pXYvCZOvWaM3e04xppREeiF -UNq8XctterVqWKC5zOgE1wY0346BgWtJvcYL9px71w2EE0bsZ/gwuphOYRblLtbmsKLwheMQ -JO2wfusPsAEGDdoaTRenEmosi/DRWt+oxodZSWygETk8fPESqcvmnjhPpVvCHksdIWEqUBXy -rg6NkkyIjLdMqeuBp/IrUN1XGBOrUgdVNpCNuiMN1Ai+6L9g364fLP7xYB84kLK+QSO03Bpv -j+D5Ca2DRweTmTaCQzaOeR2KW9kgf2tbLJbIoM2OiXLcfGN5bPvZVc2ODverOCRDiVwcVkd+ -sfbG3sUkyV+1NSYTJYTRnaNjsQmNGBfI0mI7v0zEHVt+X0tuJeP5QcMJ1lvLqBiZgZQDFVg4 -vtchDLFTv2JlLfsbyG+U2f2iLA3mauyFRS+x1ZFeIENsXwSqLn1WXvslnkV8cTs4hTFb1Skj -zC89XbjY2PUJMg2XWLeWjvv6pVGvdRVlPuujbou93SMfPSdYPqOrX4eX42I66GXuXMczbu9H -F8kk7OpyP9cYo8LpiHjuxHm/VMFLckagluXwZCl6uiIRB+IJJmd+2jcAEQEAAYkERAQYAQgA -DwUCV+kf9QIbAgUJCWYBgAIpCRA4XLwcf2Z/rsFdIAQZAQgABgUCV+kf9QAKCRBjMbgT6Sl8 -4NSbD/9ueOFntw+rs2q7hAGOq2LP3D/d7SuU+j8vUcszJK2ETQlKX9IcQs3c+T4AbpQ4O5Ea -EvvYEAVmPjosk9zn7sxiWrzvDbvfhQK6hR6zbBK2LB7yTkzBh3oT8WghbCqeTDqJMl47PUv5 -yUVsX4RHmbgo7qymRGiPJ8a+5QPOmtmdoyaEv0hGvszya4aTKexLM4fU+k+e8kupY9fTICE7 -S7zUpX7hpFYC4d/uk3KUkCvebox2C4UomT2kV518/Pnj/6wpWQ3GHnqIurMPOW097VsP3epl -jutNwXM3sH6rbgiiZqdQFb3bq1Da4fpNqnH6Rdm7fSjjV2R36qDrPQz/AfZC2fouq2Xbse6M -RKR48peb80cvtGqhc2J7FHWfEu8da/26Gxq07SOod9svR8eBcJAnlCd3Hca0T2qmaM52WvC+ -Mjxsjgg6yGh0PenjsNQM2mdhvKUflqbLluY4E2QPHVJZlT3Bo5LekM91ZZAgd4F3xBE25/WL -Akg2/rsCiulAfaEXAPQkqCaB7ajd9dvJXcq5qvWSvSgW5vL/nnyecE5ktf8todaMhMz83gpt -eXtR8Ms7401d2Qwt28NifXkgEMMNfytXg/0TO6F0uRGi67SoAeadUjug2JSr7LBmeQHyOvLR -q+0iO1m3f3pSSduqBjKWUFnJShED8FafaRUrE1+HWN2lD/0Sci1X33CrTXNSQCzdTaD3R/SJ -B+BSspEQNV/JqAPjJD9ZK3dwDm5upmrjpFNjSVvcQJoy0J1rW2q2E8y8ECuxErUWQqyFv/Co -y39WpwgWam19ykP3yNiU9UHGb58DhuMRwLOYF7o5Iwg2nbiYtHO5jSmC3PPpYz3TLvA/kSTK -1T1m6ac2dA6UMLn3t3Cohv50wpr41bxLz04ig/dEmrdP72HRpA5oNoXAXCaCeeed5R1DfxgW -RL2fP+GL6ZftTplw3AL2trJa+0zLFHvDo+M4c1brM2x0HYEoX+qSpFMxtixgV0D5Uf7RUMkN -eYPb4SZRc6wDHIt7Wqp/qlUozC94DKbFUrK4UnHyK4+HVlSQJGevqm+Y+QoqIBcnhOEN0Bzo -01aVHIZFxzk4R2bppFEDiFEw1zL2DAPj/xX7Zqrjsg/qdVu9bUklBxir6QSOwZGZMGYCuBWM -uJU3IY7Xzx/6Anm5oqbXLVLwVFwS8tED+/XYjPUo1ifLGVx96THuQrNBMhpwNE/9Qd4zbjnE -7f6foXLgeB/l2h65zrI6O1RdEAUpA8Tuhgy0PwNc/1mviaOkYx9qFlhyjruTd72TV4va+5Qb -L7wnh417OQNbpWUqb5HvN5BruDFQOBztFupi/7LHWnSX4XVO777SYzlf1a7DdJu45cql44d2 -LrdPYOGtAA== -=a0Oj ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.3.0M5-mysql/Dockerfile b/hawkbit-runtime/docker/0.3.0M5-mysql/Dockerfile deleted file mode 100644 index 312fc36364..0000000000 --- a/hawkbit-runtime/docker/0.3.0M5-mysql/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM hawkbit/hawkbit-update-server:0.3.0M5 - -ENV MARIADB_DRIVER_VERSION=2.4.2 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose https://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose https://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ - && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \ - && apk del build-dependencies - -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.3.0M5-mysql/KEY b/hawkbit-runtime/docker/0.3.0M5-mysql/KEY deleted file mode 100644 index 4c602ae045..0000000000 --- a/hawkbit-runtime/docker/0.3.0M5-mysql/KEY +++ /dev/null @@ -1,40 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQENBFSTDbABCADuZ2k4NIsmhrSyAw/49GQugqPF40P0ldkTPkKDx8b6eNFtPFJbsyw9yKqU -EIS+9eFtIEMLLR4CIHMM56adZe5q5Wp7g/+rnHgTuefVWfMg42Vaxdk8lTQIN2Z3gSsj36DZ -TtO+SmxixFfxHb2YESUvgVzeWIaFBKZCV4JdumniI02RCAPuqxIHKYmhwuqQSpzIAuZQEVvM -qSwFBUOr+CSf3+YzQ/PmFqldlQOQKbSE6G2H7E1mMhRBI07uryo1gDSM42DSFcZ+eQCzCHQr -CNC+2TtBrPkmPNU7TpngtjBthjwF/qJVVX8/q+syv524E1MtO+uXwf4PvrFJ537SkfdHABEB -AAG0OE1hcmlhREIgRW50ZXJwcmlzZSBTaWduaW5nIEtleSA8c2lnbmluZy1rZXlAbWFyaWFk -Yi5jb20+iEYEEhEIAAYFAlTeJRQACgkQy8sIKhu5Q9tQ8wCfXu/gtMah1J9a+CB1RDKt2s4C -alIAn0LqQcsEib4zrHgBeMwp6Wvre/qZiQE4BBMBAgAiBQJUkw2wAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRDOGj3V48lPSbWuCACnykjC688qarR5aCJOkjQVruc+3GaM/8Mk -8sXT8GZisJyTott6o++tdjx4GLvnBZFssLDfnZwza9rS79GJAdHqshk4t6V8GqTK8OG2IHJk -XKG0xASUTWV3+oLA2Dbw4ILmgWZxncHTnmEx+x2DGUWTshfwrqBMFy0ksKjeWMnFSzOgbTRW -1Z7z3U4cm8dZWNAD6bNQbZBaXDUk/FOTFpGwXqB7DR/y6AMpJq2i+orD0gTW5yhdSsMasHpP -5YCcztONl9Ft08EggkzhwQSzdP+R0eI6uf/wnB9G2nkGQxHsXe1oc1UqOEQpdJgPhEv4lkFP -4izB1Ix/x4YjhlkXZqGziQIcBBIBCAAGBQJU3iVrAAoJEJFxGJmV5FqejVIP/0Qm+CWS+UZ9 -39wUkV/kvfbvhCiVMQmtJDWUJVWRYDXZsfxgdAs4RaKlIrvXShUbWSrGCPwLJkg+FBjXpXqy -/1Qf/TXHrlGGDTZ+SUOfU4O0+HKNqjGdQf3yZdJzoMySY0HdE7eob74ITqnZVjL/bZXsJzZi -xxkqhXZxHi4ToHJkDE75rO2kjYXpaOdg90MiS2nvJm9pexnVvLWIfsPYfkxHaJ3WV+HOZixT -MYKtgiPG6ebiYdOTdbfY8d7uHIxoaqiednBqjpMGygb+YL3SYOWi/rj6LzLs4Z8ISM2OJg01 -2DYL6bsIkHWbf0EcuSVdZ4o5l8V+Z055KI3vRwFadU/fpBHvV1EuXcQNOgKvc19KnoG2RIMQ -/aGVekwzbxqunY2syuQjTEycJPJ02c4r0+o31ge+BQl0K8gmn3F2geS+JqjKNXdJtLYzH3bw -upKKsXmacOUAzyM+ic5BtYkDWiNAxy9Az2OxunXjeFnBjVxJxqVbSbZMlziT1I8I8QHtNNzg -yhd3rmTU3w0oQiVM7XmGPeat09QW8/ift/ABN4t0RdVCTyBtdrzUsI/eIb8NOBLw0gkAgyNe -jiMb8H4WGd4CggA9TGmN/OOpDd0PWSWWR+05oU5LeJAAuWdqSUWGr8qiAXWSnv9Jg9y0SC2C -D7XV0eudrAy94uqeooeVh+x8iQIcBBIBCAAGBQJV8eBgAAoJEEHdwLQNpW8iwDIP/RDSgy1S -43q6SMmJiOyok+kqTBaGKNqouN3TV7vual8sS77vpe/o3sr9SrcAsdiFf4Rq81aJ61ZwJ5JI -0ZnhfJhSOo/3CJiLHsQ/XH1hurmjS0VRtYiZDe8lbLHhPWJsnC96LyPrg4pHCF8SH/XmUN9F -rqq3izeezh1fOsxjPwLixtzaf3yoQI6JzFq+ENzs0PB7JzYnrcO8oGrtVdRJUQIHg3B7Kq0B -c4rc4QPNFxPTxXfQiQtkTzkJHc8I956WFkcxnXxcEJXYdre3LVBnlNkQmvyT48Z5z/jZmBWf -NFqHvndFhGgPMrlgzuMjiEnvjx1jbk2dxQNC/Ugfq2PfTsng8rsjtLTaPoSV/csfCM3Thimm -Wcs1tqfMb9q2uFRG+kR9o8w+3TY5SkY611YqSWpBcAghixOaEGrcyDwBARVZDEEfzyWCqSEd -eQsUrsNYhAiVYI+ubYNKO9rtI+SZi5EtD5nwSKLNZFwDxvRX9PIbaT2vsRNzjqeMOkpjDg7S -79lMicr7idOon4dpLl411HpClV8MnuWmekAa/L9Ee52J50ti3Rx7MDgPISJi9ZykqpPrxmt1 -A+9ZkKE6VB63nTMBOpLUh0zD4yFHYjAUyDpSTH3SLNtVu3UfkLJ+Nr7AAKoV9YQgTmu3wSPR -FsnHsQksxFhCqGYdUKyfRsobs/Ns -=ovQp ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.3.0M5/Dockerfile b/hawkbit-runtime/docker/0.3.0M5/Dockerfile deleted file mode 100644 index a98ab42216..0000000000 --- a/hawkbit-runtime/docker/0.3.0M5/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM openjdk:8u201-jre-alpine - -ENV HAWKBIT_VERSION=0.3.0M5 \ - HAWKBIT_HOME=/opt/hawkbit - -EXPOSE 8080 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && mkdir -p $HAWKBIT_HOME \ - && cd $HAWKBIT_HOME \ - && wget -O hawkbit-update-server.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ - && wget -O hawkbit-update-server.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ - && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar \ - && apk del build-dependencies - -VOLUME "$HAWKBIT_HOME/data" - -WORKDIR $HAWKBIT_HOME -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.3.0M5/KEY b/hawkbit-runtime/docker/0.3.0M5/KEY deleted file mode 100644 index 7a959f646d..0000000000 --- a/hawkbit-runtime/docker/0.3.0M5/KEY +++ /dev/null @@ -1,79 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQINBFflTWwBEAC9YoTvzZlCcQSrqPdovEmAlxlIKzPqE+06Pig87dcn+2PJDDnk9Rl9eDEH -CWKrds4mg7lVgzFApI73V7agHj9bqSyPWbp1GtReDvD4QKNEb4RM9XY8O1rStOTrznhfVIGc -oi9wKPTQWk5GXiqh6rawiyZnAfKm9WPZhKaxIi4m0zcTpJQ2dwbPi0hBpeEMJTyadId4Y+bB -AmH2qGKCOi2NXQDGDJ9BOkjLMVmPlgxnj8QBgZlUgRnVkYNjas/eVcXM5w6BQ884vUuSm35r -PelQOflmUAUiCGoE7UAhfrJdd5tOdWbn9bnCjv1eUyj2hJwJRRwRZjHvsvJygEg7T00Ntur3 -UN8fich29cjPGzjkilqK1NkRPZGROchn5MDhSoeUpGXEDL5bPAWHCNLqus6gMx5vNJ2IuNmW -rHSlsNy0pkWu88xtanjZjgX416nY7RPsmvZ1WRr04tegYB2CGO5aQWK1l+k6ciXWLqC23SAg -FE/2Edbzaxvc6jJi5cVGvvZAoH8J7wXCF0zFwORypNyXbNoiAQQnlW7LBJtJU6KihkuTjbDJ -1wmphLIdMoPTXLOxVVBTM7rsYa3ev9o9V9Z0dkAv364fO7zc/RpEoqM33NmNTzS8DUP/TF6J -UQftNJL+ExCreDqxlkyTgqf/+s/k1Z1kuYEKdRmk4MILVKGZvQARAQABtDFFY2xpcHNlIGhh -d2tCaXQgUHJvamVjdCA8aGF3a2JpdC1kZXZAZWNsaXBzZS5vcmc+iQEcBBABCAAGBQJX6nMW -AAoJEPqgpYKzPV/BDqEIAKAOy1JQjPccNwvZg8Y5OwW2QhB4lvq8ngzniSok/PAGdjsfVlJu -4zPgFkBcqgtAbXycOZXpMXQZBekfWslnDU7RtRAIZ6hJAuiJOL7qOOM3X03YHvq1HVWv2JK/ -g8NSoG1C2dw+GIsK2k4886QGX+a7pN7Mt0ZAbsVAaZx2Cig+iVc74+YW6UY6BiMOj1nGGSyG -9AT0pMgUWBbqvjpeKmiFzP5XVEL7e6pAS4jZAiYNp0xHPdYG/ANiq+hQAArmeaZa2hxOmygJ -CZvh6dYKBXMfRAQFBF8burVyhiJOV2Pn3kCxTSckaO63sZ+ayzBNrVu8Mpf0h2rIEGVVdWlx -KjyJARwEEAEIAAYFAlfrcXQACgkQZZoexg+SnXSfzQf7BWaH/x2yBzCmpbxpbUhI50bGvj6L -jasb6q68Q875ODwls9jve0ip0p7bcRwvbJ4Fd1OypwkxV3R/JdPlfkQwA4CoqHQpMOdN+iQ+ -aA8I86Z/dDL2yZS8e6cTdlRmIwC2RKAkNoy39t0P5UG3Zf6yiES0YaWB0zZQZwtBwNyOOPXD -1L2X/mKXT1yfLgc8YeBx+ojhr8LpzNZKA1vqyQ04YCYByMXy2FGqEaTHwbIZXFJ1IxIs956J -0SD929Nkw3m2/ZSONOLD0uMwb91A9lv9vRWU+bwp18S5j63N5NEEM6QsGOt9VgDhy01zdb46 -1e99V1IYkh863gCEHyJFOJi+RYkCHAQQAQgABgUCV+VPmAAKCRCforcpn1HlQ5VCD/9SxkSV -iV8sywK3cZm9lkYlnot33lAH/dYDf4md1mOf8vfNWTB0L9s5LOK9n6SWHdEKYd+f3OAP7ZM5 -Div30B/TmkyR4BgtMAkDOQSIR5+iEzXI2+iklEb1I+vhFVkKNOGoOaWRiDWZScWgwPBylYuj -iPjRAjKxtZuuhy5A4d6HkvdugoQ+4GdHeazkSeXLADz6XFBrQpUrTGCuNqdpE8QKkX4xmZ4L -Vvur3h/STBsJBfewuC4FhDTryFdd/vygivV7LrHzJlgTNqoK+oxL0wiietLtHvpwpS/gGcrq -a+8ccvPN+HhGCgpkeULEp8MUwp5fqoJxU57AZHUo/ER+6jmMSRz8V7M/VoZxwoGcH3o+paYw -GfxEPovaA6jadzEQomQTK3qsrx8nXflYPH39o3NYBM+MBLnsv6kndPqBb7OtBt2ZVges04zM -mbIYgpAUZgIOoCR75uU21DO2hbS7EHwd4nqY5vOfFSlMgtBcInjmXRiqDADspJv3938J/E2n -7M7ijERcQn6UmhCmdYLCLo2bAODp0mjjcftu6Ct65VLP1WRp95qr21VSDBoozwd9eL0AzAoC -SOhZPmDoeFoo3QcekEi4gxRtQvSdEZ0YteUENXmpSX+c/IKba5lpk4baC52HvhlNlmeu0DxX -VWqYF7O/9Z4hl2lQ5LHiSb2L0S1+6YkCPQQTAQgAJwUCV+VNbAIbLwUJCWYBgAULCQgHAwUV -CgkICwUWAgMBAAIeAQIXgAAKCRA4XLwcf2Z/rujfD/0Wp1uYXRsAzEcZavASh1Xe2301atbU -aRUy8UsNWO5oCvVjyyaPM4c3MT72sqsLyNXAWhi/MP63M0qr2+M0nN/91U8r98/Mbd+WlzRy -CLJYUX72Oqrfan+hZxcd7Xlu+sKHNshOlCy4114bVnrdq16LfeIAkx7GLw9/lMc9lRrvUwMI -684zhquROpuDD1aE/i/gBGgzd8cMoW+hdjFVA0zwe+6FgrWR2CMiKCJfeYWLuFiBNmFZC6l8 -BqiEqCuyQu6dFpWHhtK3fPJAEYIiNkORT8M3HSXl/Ex/w9ErweZKHiSja7KMAUWXkZi+Ayva -jMVI4jumXwgZW/7uuSc6bbv2SO4BSfMHvFtEuBSBWXi9e0urgqNOFQuKE7zokSbEStwG4+gN -E32ZuS2sllOxr41Nx/q2oKMeKePZBqoD5+3mDtRP432KWZjZjlhyez0Kh8aJ8lz5MM7Xxtzo -OyJeO4JHqbuBV82GvoLXVsYJBOUfRuBaZQcphUjamZwDZQFEvoKe6Ltur6+gsqu4UsQzs2bp -i26yaP3e1mrLc9Q5KAH7EkOr7wD3zo7jtJ21luGCBOtZ113oWJZgAwaevDC6cY/k32YgK8+q -iqMtNC7APznXyN4eVjKB18aSM7rVNdE8vlA818b7DbKXsqjH9N7VdiW2/4F8TJNq+OCVPjMf -pfM3KLkCDQRX6R/1ARAAplIU5GesaA42f8+idIEnozpd7aJKs8PuaOUUWr/7CmozpHNXpjPP -uPRflSRmFBeigp50xNfpLwYXjbjoVaiqdPKp6rxko0kh6NcG+pXYvCZOvWaM3e04xppREeiF -UNq8XctterVqWKC5zOgE1wY0346BgWtJvcYL9px71w2EE0bsZ/gwuphOYRblLtbmsKLwheMQ -JO2wfusPsAEGDdoaTRenEmosi/DRWt+oxodZSWygETk8fPESqcvmnjhPpVvCHksdIWEqUBXy -rg6NkkyIjLdMqeuBp/IrUN1XGBOrUgdVNpCNuiMN1Ai+6L9g364fLP7xYB84kLK+QSO03Bpv -j+D5Ca2DRweTmTaCQzaOeR2KW9kgf2tbLJbIoM2OiXLcfGN5bPvZVc2ODverOCRDiVwcVkd+ -sfbG3sUkyV+1NSYTJYTRnaNjsQmNGBfI0mI7v0zEHVt+X0tuJeP5QcMJ1lvLqBiZgZQDFVg4 -vtchDLFTv2JlLfsbyG+U2f2iLA3mauyFRS+x1ZFeIENsXwSqLn1WXvslnkV8cTs4hTFb1Skj -zC89XbjY2PUJMg2XWLeWjvv6pVGvdRVlPuujbou93SMfPSdYPqOrX4eX42I66GXuXMczbu9H -F8kk7OpyP9cYo8LpiHjuxHm/VMFLckagluXwZCl6uiIRB+IJJmd+2jcAEQEAAYkERAQYAQgA -DwUCV+kf9QIbAgUJCWYBgAIpCRA4XLwcf2Z/rsFdIAQZAQgABgUCV+kf9QAKCRBjMbgT6Sl8 -4NSbD/9ueOFntw+rs2q7hAGOq2LP3D/d7SuU+j8vUcszJK2ETQlKX9IcQs3c+T4AbpQ4O5Ea -EvvYEAVmPjosk9zn7sxiWrzvDbvfhQK6hR6zbBK2LB7yTkzBh3oT8WghbCqeTDqJMl47PUv5 -yUVsX4RHmbgo7qymRGiPJ8a+5QPOmtmdoyaEv0hGvszya4aTKexLM4fU+k+e8kupY9fTICE7 -S7zUpX7hpFYC4d/uk3KUkCvebox2C4UomT2kV518/Pnj/6wpWQ3GHnqIurMPOW097VsP3epl -jutNwXM3sH6rbgiiZqdQFb3bq1Da4fpNqnH6Rdm7fSjjV2R36qDrPQz/AfZC2fouq2Xbse6M -RKR48peb80cvtGqhc2J7FHWfEu8da/26Gxq07SOod9svR8eBcJAnlCd3Hca0T2qmaM52WvC+ -Mjxsjgg6yGh0PenjsNQM2mdhvKUflqbLluY4E2QPHVJZlT3Bo5LekM91ZZAgd4F3xBE25/WL -Akg2/rsCiulAfaEXAPQkqCaB7ajd9dvJXcq5qvWSvSgW5vL/nnyecE5ktf8todaMhMz83gpt -eXtR8Ms7401d2Qwt28NifXkgEMMNfytXg/0TO6F0uRGi67SoAeadUjug2JSr7LBmeQHyOvLR -q+0iO1m3f3pSSduqBjKWUFnJShED8FafaRUrE1+HWN2lD/0Sci1X33CrTXNSQCzdTaD3R/SJ -B+BSspEQNV/JqAPjJD9ZK3dwDm5upmrjpFNjSVvcQJoy0J1rW2q2E8y8ECuxErUWQqyFv/Co -y39WpwgWam19ykP3yNiU9UHGb58DhuMRwLOYF7o5Iwg2nbiYtHO5jSmC3PPpYz3TLvA/kSTK -1T1m6ac2dA6UMLn3t3Cohv50wpr41bxLz04ig/dEmrdP72HRpA5oNoXAXCaCeeed5R1DfxgW -RL2fP+GL6ZftTplw3AL2trJa+0zLFHvDo+M4c1brM2x0HYEoX+qSpFMxtixgV0D5Uf7RUMkN -eYPb4SZRc6wDHIt7Wqp/qlUozC94DKbFUrK4UnHyK4+HVlSQJGevqm+Y+QoqIBcnhOEN0Bzo -01aVHIZFxzk4R2bppFEDiFEw1zL2DAPj/xX7Zqrjsg/qdVu9bUklBxir6QSOwZGZMGYCuBWM -uJU3IY7Xzx/6Anm5oqbXLVLwVFwS8tED+/XYjPUo1ifLGVx96THuQrNBMhpwNE/9Qd4zbjnE -7f6foXLgeB/l2h65zrI6O1RdEAUpA8Tuhgy0PwNc/1mviaOkYx9qFlhyjruTd72TV4va+5Qb -L7wnh417OQNbpWUqb5HvN5BruDFQOBztFupi/7LHWnSX4XVO777SYzlf1a7DdJu45cql44d2 -LrdPYOGtAA== -=a0Oj ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.3.0M6-mysql/Dockerfile b/hawkbit-runtime/docker/0.3.0M6-mysql/Dockerfile deleted file mode 100644 index 10b8343ac0..0000000000 --- a/hawkbit-runtime/docker/0.3.0M6-mysql/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM hawkbit/hawkbit-update-server:0.3.0M6 - -ENV MARIADB_DRIVER_VERSION=2.5.3 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose https://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose https://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ - && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \ - && apk del build-dependencies - -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.3.0M6-mysql/KEY b/hawkbit-runtime/docker/0.3.0M6-mysql/KEY deleted file mode 100644 index 4c602ae045..0000000000 --- a/hawkbit-runtime/docker/0.3.0M6-mysql/KEY +++ /dev/null @@ -1,40 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQENBFSTDbABCADuZ2k4NIsmhrSyAw/49GQugqPF40P0ldkTPkKDx8b6eNFtPFJbsyw9yKqU -EIS+9eFtIEMLLR4CIHMM56adZe5q5Wp7g/+rnHgTuefVWfMg42Vaxdk8lTQIN2Z3gSsj36DZ -TtO+SmxixFfxHb2YESUvgVzeWIaFBKZCV4JdumniI02RCAPuqxIHKYmhwuqQSpzIAuZQEVvM -qSwFBUOr+CSf3+YzQ/PmFqldlQOQKbSE6G2H7E1mMhRBI07uryo1gDSM42DSFcZ+eQCzCHQr -CNC+2TtBrPkmPNU7TpngtjBthjwF/qJVVX8/q+syv524E1MtO+uXwf4PvrFJ537SkfdHABEB -AAG0OE1hcmlhREIgRW50ZXJwcmlzZSBTaWduaW5nIEtleSA8c2lnbmluZy1rZXlAbWFyaWFk -Yi5jb20+iEYEEhEIAAYFAlTeJRQACgkQy8sIKhu5Q9tQ8wCfXu/gtMah1J9a+CB1RDKt2s4C -alIAn0LqQcsEib4zrHgBeMwp6Wvre/qZiQE4BBMBAgAiBQJUkw2wAhsDBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRDOGj3V48lPSbWuCACnykjC688qarR5aCJOkjQVruc+3GaM/8Mk -8sXT8GZisJyTott6o++tdjx4GLvnBZFssLDfnZwza9rS79GJAdHqshk4t6V8GqTK8OG2IHJk -XKG0xASUTWV3+oLA2Dbw4ILmgWZxncHTnmEx+x2DGUWTshfwrqBMFy0ksKjeWMnFSzOgbTRW -1Z7z3U4cm8dZWNAD6bNQbZBaXDUk/FOTFpGwXqB7DR/y6AMpJq2i+orD0gTW5yhdSsMasHpP -5YCcztONl9Ft08EggkzhwQSzdP+R0eI6uf/wnB9G2nkGQxHsXe1oc1UqOEQpdJgPhEv4lkFP -4izB1Ix/x4YjhlkXZqGziQIcBBIBCAAGBQJU3iVrAAoJEJFxGJmV5FqejVIP/0Qm+CWS+UZ9 -39wUkV/kvfbvhCiVMQmtJDWUJVWRYDXZsfxgdAs4RaKlIrvXShUbWSrGCPwLJkg+FBjXpXqy -/1Qf/TXHrlGGDTZ+SUOfU4O0+HKNqjGdQf3yZdJzoMySY0HdE7eob74ITqnZVjL/bZXsJzZi -xxkqhXZxHi4ToHJkDE75rO2kjYXpaOdg90MiS2nvJm9pexnVvLWIfsPYfkxHaJ3WV+HOZixT -MYKtgiPG6ebiYdOTdbfY8d7uHIxoaqiednBqjpMGygb+YL3SYOWi/rj6LzLs4Z8ISM2OJg01 -2DYL6bsIkHWbf0EcuSVdZ4o5l8V+Z055KI3vRwFadU/fpBHvV1EuXcQNOgKvc19KnoG2RIMQ -/aGVekwzbxqunY2syuQjTEycJPJ02c4r0+o31ge+BQl0K8gmn3F2geS+JqjKNXdJtLYzH3bw -upKKsXmacOUAzyM+ic5BtYkDWiNAxy9Az2OxunXjeFnBjVxJxqVbSbZMlziT1I8I8QHtNNzg -yhd3rmTU3w0oQiVM7XmGPeat09QW8/ift/ABN4t0RdVCTyBtdrzUsI/eIb8NOBLw0gkAgyNe -jiMb8H4WGd4CggA9TGmN/OOpDd0PWSWWR+05oU5LeJAAuWdqSUWGr8qiAXWSnv9Jg9y0SC2C -D7XV0eudrAy94uqeooeVh+x8iQIcBBIBCAAGBQJV8eBgAAoJEEHdwLQNpW8iwDIP/RDSgy1S -43q6SMmJiOyok+kqTBaGKNqouN3TV7vual8sS77vpe/o3sr9SrcAsdiFf4Rq81aJ61ZwJ5JI -0ZnhfJhSOo/3CJiLHsQ/XH1hurmjS0VRtYiZDe8lbLHhPWJsnC96LyPrg4pHCF8SH/XmUN9F -rqq3izeezh1fOsxjPwLixtzaf3yoQI6JzFq+ENzs0PB7JzYnrcO8oGrtVdRJUQIHg3B7Kq0B -c4rc4QPNFxPTxXfQiQtkTzkJHc8I956WFkcxnXxcEJXYdre3LVBnlNkQmvyT48Z5z/jZmBWf -NFqHvndFhGgPMrlgzuMjiEnvjx1jbk2dxQNC/Ugfq2PfTsng8rsjtLTaPoSV/csfCM3Thimm -Wcs1tqfMb9q2uFRG+kR9o8w+3TY5SkY611YqSWpBcAghixOaEGrcyDwBARVZDEEfzyWCqSEd -eQsUrsNYhAiVYI+ubYNKO9rtI+SZi5EtD5nwSKLNZFwDxvRX9PIbaT2vsRNzjqeMOkpjDg7S -79lMicr7idOon4dpLl411HpClV8MnuWmekAa/L9Ee52J50ti3Rx7MDgPISJi9ZykqpPrxmt1 -A+9ZkKE6VB63nTMBOpLUh0zD4yFHYjAUyDpSTH3SLNtVu3UfkLJ+Nr7AAKoV9YQgTmu3wSPR -FsnHsQksxFhCqGYdUKyfRsobs/Ns -=ovQp ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/0.3.0M6/Dockerfile b/hawkbit-runtime/docker/0.3.0M6/Dockerfile deleted file mode 100644 index 6701a28efb..0000000000 --- a/hawkbit-runtime/docker/0.3.0M6/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM openjdk:8u212-jre-alpine - -ENV HAWKBIT_VERSION=0.3.0M6 \ - HAWKBIT_HOME=/opt/hawkbit - -EXPOSE 8080 - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && mkdir -p $HAWKBIT_HOME \ - && cd $HAWKBIT_HOME \ - && wget -O hawkbit-update-server.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar \ - && wget -O hawkbit-update-server.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/hawkbit-update-server/$HAWKBIT_VERSION/hawkbit-update-server-$HAWKBIT_VERSION.jar.asc \ - && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar \ - && apk del build-dependencies - -VOLUME "$HAWKBIT_HOME/data" - -WORKDIR $HAWKBIT_HOME -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.3.0M6/KEY b/hawkbit-runtime/docker/0.3.0M6/KEY deleted file mode 100644 index 7a959f646d..0000000000 --- a/hawkbit-runtime/docker/0.3.0M6/KEY +++ /dev/null @@ -1,79 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQINBFflTWwBEAC9YoTvzZlCcQSrqPdovEmAlxlIKzPqE+06Pig87dcn+2PJDDnk9Rl9eDEH -CWKrds4mg7lVgzFApI73V7agHj9bqSyPWbp1GtReDvD4QKNEb4RM9XY8O1rStOTrznhfVIGc -oi9wKPTQWk5GXiqh6rawiyZnAfKm9WPZhKaxIi4m0zcTpJQ2dwbPi0hBpeEMJTyadId4Y+bB -AmH2qGKCOi2NXQDGDJ9BOkjLMVmPlgxnj8QBgZlUgRnVkYNjas/eVcXM5w6BQ884vUuSm35r -PelQOflmUAUiCGoE7UAhfrJdd5tOdWbn9bnCjv1eUyj2hJwJRRwRZjHvsvJygEg7T00Ntur3 -UN8fich29cjPGzjkilqK1NkRPZGROchn5MDhSoeUpGXEDL5bPAWHCNLqus6gMx5vNJ2IuNmW -rHSlsNy0pkWu88xtanjZjgX416nY7RPsmvZ1WRr04tegYB2CGO5aQWK1l+k6ciXWLqC23SAg -FE/2Edbzaxvc6jJi5cVGvvZAoH8J7wXCF0zFwORypNyXbNoiAQQnlW7LBJtJU6KihkuTjbDJ -1wmphLIdMoPTXLOxVVBTM7rsYa3ev9o9V9Z0dkAv364fO7zc/RpEoqM33NmNTzS8DUP/TF6J -UQftNJL+ExCreDqxlkyTgqf/+s/k1Z1kuYEKdRmk4MILVKGZvQARAQABtDFFY2xpcHNlIGhh -d2tCaXQgUHJvamVjdCA8aGF3a2JpdC1kZXZAZWNsaXBzZS5vcmc+iQEcBBABCAAGBQJX6nMW -AAoJEPqgpYKzPV/BDqEIAKAOy1JQjPccNwvZg8Y5OwW2QhB4lvq8ngzniSok/PAGdjsfVlJu -4zPgFkBcqgtAbXycOZXpMXQZBekfWslnDU7RtRAIZ6hJAuiJOL7qOOM3X03YHvq1HVWv2JK/ -g8NSoG1C2dw+GIsK2k4886QGX+a7pN7Mt0ZAbsVAaZx2Cig+iVc74+YW6UY6BiMOj1nGGSyG -9AT0pMgUWBbqvjpeKmiFzP5XVEL7e6pAS4jZAiYNp0xHPdYG/ANiq+hQAArmeaZa2hxOmygJ -CZvh6dYKBXMfRAQFBF8burVyhiJOV2Pn3kCxTSckaO63sZ+ayzBNrVu8Mpf0h2rIEGVVdWlx -KjyJARwEEAEIAAYFAlfrcXQACgkQZZoexg+SnXSfzQf7BWaH/x2yBzCmpbxpbUhI50bGvj6L -jasb6q68Q875ODwls9jve0ip0p7bcRwvbJ4Fd1OypwkxV3R/JdPlfkQwA4CoqHQpMOdN+iQ+ -aA8I86Z/dDL2yZS8e6cTdlRmIwC2RKAkNoy39t0P5UG3Zf6yiES0YaWB0zZQZwtBwNyOOPXD -1L2X/mKXT1yfLgc8YeBx+ojhr8LpzNZKA1vqyQ04YCYByMXy2FGqEaTHwbIZXFJ1IxIs956J -0SD929Nkw3m2/ZSONOLD0uMwb91A9lv9vRWU+bwp18S5j63N5NEEM6QsGOt9VgDhy01zdb46 -1e99V1IYkh863gCEHyJFOJi+RYkCHAQQAQgABgUCV+VPmAAKCRCforcpn1HlQ5VCD/9SxkSV -iV8sywK3cZm9lkYlnot33lAH/dYDf4md1mOf8vfNWTB0L9s5LOK9n6SWHdEKYd+f3OAP7ZM5 -Div30B/TmkyR4BgtMAkDOQSIR5+iEzXI2+iklEb1I+vhFVkKNOGoOaWRiDWZScWgwPBylYuj -iPjRAjKxtZuuhy5A4d6HkvdugoQ+4GdHeazkSeXLADz6XFBrQpUrTGCuNqdpE8QKkX4xmZ4L -Vvur3h/STBsJBfewuC4FhDTryFdd/vygivV7LrHzJlgTNqoK+oxL0wiietLtHvpwpS/gGcrq -a+8ccvPN+HhGCgpkeULEp8MUwp5fqoJxU57AZHUo/ER+6jmMSRz8V7M/VoZxwoGcH3o+paYw -GfxEPovaA6jadzEQomQTK3qsrx8nXflYPH39o3NYBM+MBLnsv6kndPqBb7OtBt2ZVges04zM -mbIYgpAUZgIOoCR75uU21DO2hbS7EHwd4nqY5vOfFSlMgtBcInjmXRiqDADspJv3938J/E2n -7M7ijERcQn6UmhCmdYLCLo2bAODp0mjjcftu6Ct65VLP1WRp95qr21VSDBoozwd9eL0AzAoC -SOhZPmDoeFoo3QcekEi4gxRtQvSdEZ0YteUENXmpSX+c/IKba5lpk4baC52HvhlNlmeu0DxX -VWqYF7O/9Z4hl2lQ5LHiSb2L0S1+6YkCPQQTAQgAJwUCV+VNbAIbLwUJCWYBgAULCQgHAwUV -CgkICwUWAgMBAAIeAQIXgAAKCRA4XLwcf2Z/rujfD/0Wp1uYXRsAzEcZavASh1Xe2301atbU -aRUy8UsNWO5oCvVjyyaPM4c3MT72sqsLyNXAWhi/MP63M0qr2+M0nN/91U8r98/Mbd+WlzRy -CLJYUX72Oqrfan+hZxcd7Xlu+sKHNshOlCy4114bVnrdq16LfeIAkx7GLw9/lMc9lRrvUwMI -684zhquROpuDD1aE/i/gBGgzd8cMoW+hdjFVA0zwe+6FgrWR2CMiKCJfeYWLuFiBNmFZC6l8 -BqiEqCuyQu6dFpWHhtK3fPJAEYIiNkORT8M3HSXl/Ex/w9ErweZKHiSja7KMAUWXkZi+Ayva -jMVI4jumXwgZW/7uuSc6bbv2SO4BSfMHvFtEuBSBWXi9e0urgqNOFQuKE7zokSbEStwG4+gN -E32ZuS2sllOxr41Nx/q2oKMeKePZBqoD5+3mDtRP432KWZjZjlhyez0Kh8aJ8lz5MM7Xxtzo -OyJeO4JHqbuBV82GvoLXVsYJBOUfRuBaZQcphUjamZwDZQFEvoKe6Ltur6+gsqu4UsQzs2bp -i26yaP3e1mrLc9Q5KAH7EkOr7wD3zo7jtJ21luGCBOtZ113oWJZgAwaevDC6cY/k32YgK8+q -iqMtNC7APznXyN4eVjKB18aSM7rVNdE8vlA818b7DbKXsqjH9N7VdiW2/4F8TJNq+OCVPjMf -pfM3KLkCDQRX6R/1ARAAplIU5GesaA42f8+idIEnozpd7aJKs8PuaOUUWr/7CmozpHNXpjPP -uPRflSRmFBeigp50xNfpLwYXjbjoVaiqdPKp6rxko0kh6NcG+pXYvCZOvWaM3e04xppREeiF -UNq8XctterVqWKC5zOgE1wY0346BgWtJvcYL9px71w2EE0bsZ/gwuphOYRblLtbmsKLwheMQ -JO2wfusPsAEGDdoaTRenEmosi/DRWt+oxodZSWygETk8fPESqcvmnjhPpVvCHksdIWEqUBXy -rg6NkkyIjLdMqeuBp/IrUN1XGBOrUgdVNpCNuiMN1Ai+6L9g364fLP7xYB84kLK+QSO03Bpv -j+D5Ca2DRweTmTaCQzaOeR2KW9kgf2tbLJbIoM2OiXLcfGN5bPvZVc2ODverOCRDiVwcVkd+ -sfbG3sUkyV+1NSYTJYTRnaNjsQmNGBfI0mI7v0zEHVt+X0tuJeP5QcMJ1lvLqBiZgZQDFVg4 -vtchDLFTv2JlLfsbyG+U2f2iLA3mauyFRS+x1ZFeIENsXwSqLn1WXvslnkV8cTs4hTFb1Skj -zC89XbjY2PUJMg2XWLeWjvv6pVGvdRVlPuujbou93SMfPSdYPqOrX4eX42I66GXuXMczbu9H -F8kk7OpyP9cYo8LpiHjuxHm/VMFLckagluXwZCl6uiIRB+IJJmd+2jcAEQEAAYkERAQYAQgA -DwUCV+kf9QIbAgUJCWYBgAIpCRA4XLwcf2Z/rsFdIAQZAQgABgUCV+kf9QAKCRBjMbgT6Sl8 -4NSbD/9ueOFntw+rs2q7hAGOq2LP3D/d7SuU+j8vUcszJK2ETQlKX9IcQs3c+T4AbpQ4O5Ea -EvvYEAVmPjosk9zn7sxiWrzvDbvfhQK6hR6zbBK2LB7yTkzBh3oT8WghbCqeTDqJMl47PUv5 -yUVsX4RHmbgo7qymRGiPJ8a+5QPOmtmdoyaEv0hGvszya4aTKexLM4fU+k+e8kupY9fTICE7 -S7zUpX7hpFYC4d/uk3KUkCvebox2C4UomT2kV518/Pnj/6wpWQ3GHnqIurMPOW097VsP3epl -jutNwXM3sH6rbgiiZqdQFb3bq1Da4fpNqnH6Rdm7fSjjV2R36qDrPQz/AfZC2fouq2Xbse6M -RKR48peb80cvtGqhc2J7FHWfEu8da/26Gxq07SOod9svR8eBcJAnlCd3Hca0T2qmaM52WvC+ -Mjxsjgg6yGh0PenjsNQM2mdhvKUflqbLluY4E2QPHVJZlT3Bo5LekM91ZZAgd4F3xBE25/WL -Akg2/rsCiulAfaEXAPQkqCaB7ajd9dvJXcq5qvWSvSgW5vL/nnyecE5ktf8todaMhMz83gpt -eXtR8Ms7401d2Qwt28NifXkgEMMNfytXg/0TO6F0uRGi67SoAeadUjug2JSr7LBmeQHyOvLR -q+0iO1m3f3pSSduqBjKWUFnJShED8FafaRUrE1+HWN2lD/0Sci1X33CrTXNSQCzdTaD3R/SJ -B+BSspEQNV/JqAPjJD9ZK3dwDm5upmrjpFNjSVvcQJoy0J1rW2q2E8y8ECuxErUWQqyFv/Co -y39WpwgWam19ykP3yNiU9UHGb58DhuMRwLOYF7o5Iwg2nbiYtHO5jSmC3PPpYz3TLvA/kSTK -1T1m6ac2dA6UMLn3t3Cohv50wpr41bxLz04ig/dEmrdP72HRpA5oNoXAXCaCeeed5R1DfxgW -RL2fP+GL6ZftTplw3AL2trJa+0zLFHvDo+M4c1brM2x0HYEoX+qSpFMxtixgV0D5Uf7RUMkN -eYPb4SZRc6wDHIt7Wqp/qlUozC94DKbFUrK4UnHyK4+HVlSQJGevqm+Y+QoqIBcnhOEN0Bzo -01aVHIZFxzk4R2bppFEDiFEw1zL2DAPj/xX7Zqrjsg/qdVu9bUklBxir6QSOwZGZMGYCuBWM -uJU3IY7Xzx/6Anm5oqbXLVLwVFwS8tED+/XYjPUo1ifLGVx96THuQrNBMhpwNE/9Qd4zbjnE -7f6foXLgeB/l2h65zrI6O1RdEAUpA8Tuhgy0PwNc/1mviaOkYx9qFlhyjruTd72TV4va+5Qb -L7wnh417OQNbpWUqb5HvN5BruDFQOBztFupi/7LHWnSX4XVO777SYzlf1a7DdJu45cql44d2 -LrdPYOGtAA== -=a0Oj ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/docker/docker-compose-stack.yml b/hawkbit-runtime/docker/docker-compose-stack.yml index 099704c30a..48a0509188 100644 --- a/hawkbit-runtime/docker/docker-compose-stack.yml +++ b/hawkbit-runtime/docker/docker-compose-stack.yml @@ -1,87 +1,85 @@ # -# Copyright (c) 2018 Bosch Software Innovations GmbH and others. +# Copyright (c) 2018 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # version: '3.7' services: # --------------------- - # hawkBit service + # MySQL service # --------------------- - hawkbit: - image: "hawkbit/hawkbit-update-server:latest-mysql" + mysql: + image: "mysql:8.0" networks: - hawknet ports: - - "8080:8080" + - "3306:3306" deploy: restart_policy: condition: on-failure environment: - - 'SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/hawkbit' - - 'SPRING_DATASOURCE_USERNAME=root' - - 'SPRING_RABBITMQ_HOST=rabbitmq' - - 'SPRING_RABBITMQ_USERNAME=guest' - - 'SPRING_RABBITMQ_PASSWORD=guest' + MYSQL_DATABASE: "hawkbit" + # MYSQL_USER: "root" is created by default in the container for mysql 8.0+ + MYSQL_ALLOW_EMPTY_PASSWORD: "true" # --------------------- - # hawkBit simulator + # RabbitMQ service # --------------------- - simulator: - image: "hawkbit/hawkbit-device-simulator:latest" + rabbitmq: + image: "rabbitmq:3-management" networks: - - hawknet + - hawknet ports: - - "8083:8083" + - "15672:15672" + - "5672:5672" deploy: restart_policy: condition: on-failure - environment: - - 'HAWKBIT_DEVICE_SIMULATOR_AUTOSTARTS_[0]_TENANT=DEFAULT' - - 'SPRING_RABBITMQ_VIRTUALHOST=/' - - 'SPRING_RABBITMQ_HOST=rabbitmq' - - 'SPRING_RABBITMQ_PORT=5672' - - 'SPRING_RABBITMQ_USERNAME=guest' - - 'SPRING_RABBITMQ_PASSWORD=guest' # --------------------- - # RabbitMQ service + # hawkBit service # --------------------- - rabbitmq: - image: "rabbitmq:3-management" + hawkbit: + image: "hawkbit/hawkbit-update-server:latest-mysql" networks: - - hawknet + - hawknet ports: - - "15672:15672" - - "5672:5672" + - "8080:8080" deploy: restart_policy: condition: on-failure environment: - RABBITMQ_DEFAULT_VHOST: "/" + - 'SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/hawkbit' + - 'SPRING_DATASOURCE_USERNAME=root' + - 'SPRING_RABBITMQ_HOST=rabbitmq' + - 'SPRING_RABBITMQ_USERNAME=guest' + - 'SPRING_RABBITMQ_PASSWORD=guest' # --------------------- - # MySQL service + # hawkBit simulator # --------------------- - mysql: - image: "mysql:5.7" + simulator: + image: "hawkbit/hawkbit-device-simulator:latest" networks: - - hawknet + - hawknet ports: - - "3306:3306" + - "8083:8083" deploy: restart_policy: condition: on-failure environment: - MYSQL_DATABASE: "hawkbit" - # MYSQL_USER: "root" is created by default in the container for mysql 5.7+ - MYSQL_ALLOW_EMPTY_PASSWORD: "true" - + - 'HAWKBIT_DEVICE_SIMULATOR_AUTOSTARTS_[0]_TENANT=DEFAULT' + - 'SPRING_RABBITMQ_VIRTUALHOST=/' + - 'SPRING_RABBITMQ_HOST=rabbitmq' + - 'SPRING_RABBITMQ_PORT=5672' + - 'SPRING_RABBITMQ_USERNAME=guest' + - 'SPRING_RABBITMQ_PASSWORD=guest' networks: hawknet: diff --git a/hawkbit-runtime/docker/docker-compose.yml b/hawkbit-runtime/docker/docker-compose.yml index b7b99e5c93..3c9de0752c 100644 --- a/hawkbit-runtime/docker/docker-compose.yml +++ b/hawkbit-runtime/docker/docker-compose.yml @@ -1,10 +1,11 @@ # -# Copyright (c) 2018 Bosch Software Innovations GmbH and others. +# Copyright (c) 2018 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # version: '3' @@ -15,8 +16,6 @@ services: # --------------------- rabbitmq: image: "rabbitmq:3-management" - environment: - RABBITMQ_DEFAULT_VHOST: "/" restart: always ports: - "15672:15672" @@ -28,10 +27,10 @@ services: # MySQL service # --------------------- mysql: - image: "mysql:5.7" + image: "mysql:8.0" environment: MYSQL_DATABASE: "hawkbit" - # MYSQL_USER: "root" is created by default in the container for mysql 5.7+ + # MYSQL_USER: "root" is created by default in the container for mysql 8.0+ MYSQL_ALLOW_EMPTY_PASSWORD: "true" restart: always ports: diff --git a/hawkbit-runtime/docker/dockerfiles/.gitignore b/hawkbit-runtime/docker/dockerfiles/.gitignore new file mode 100644 index 0000000000..aacfe85f00 --- /dev/null +++ b/hawkbit-runtime/docker/dockerfiles/.gitignore @@ -0,0 +1,2 @@ +Dockerfile +Dockerfile-mysql diff --git a/hawkbit-runtime/docker/dockerfiles/Dockerfile-mysql.template b/hawkbit-runtime/docker/dockerfiles/Dockerfile-mysql.template new file mode 100644 index 0000000000..26ae5b9817 --- /dev/null +++ b/hawkbit-runtime/docker/dockerfiles/Dockerfile-mysql.template @@ -0,0 +1,15 @@ +FROM hawkbit/hawkbit-update-server:{{HAWKBIT_VERSION}} + +ENV MARIADB_DRIVER_VERSION={{MARIADB_DRIVER_VERSION}} + +COPY KEY-mysql . + +RUN set -x \ + && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ + && gpg --import KEY-mysql \ + && wget -O $HAWKBIT_HOME/mariadb-java-client.jar --no-verbose https://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ + && wget -O $HAWKBIT_HOME/mariadb-java-client.jar.asc --no-verbose https://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ + && gpg --verify --batch $HAWKBIT_HOME/mariadb-java-client.jar.asc $HAWKBIT_HOME/mariadb-java-client.jar \ + && apk del build-dependencies + +ENTRYPOINT ["java","-cp","hawkbit-update-server.jar:mariadb-java-client.jar","-Dspring.profiles.active=mysql","-Xms768m","-Xmx768m","-XX:MaxMetaspaceSize=250m","-XX:MetaspaceSize=250m","-Xss300K","-XX:+UseG1GC","-XX:+UseStringDeduplication","-XX:+UseCompressedOops","-XX:+HeapDumpOnOutOfMemoryError","org.springframework.boot.loader.JarLauncher"] diff --git a/hawkbit-runtime/docker/generator/template/Dockerfile b/hawkbit-runtime/docker/dockerfiles/Dockerfile.template similarity index 96% rename from hawkbit-runtime/docker/generator/template/Dockerfile rename to hawkbit-runtime/docker/dockerfiles/Dockerfile.template index cdbf300f25..a1226f424a 100644 --- a/hawkbit-runtime/docker/generator/template/Dockerfile +++ b/hawkbit-runtime/docker/dockerfiles/Dockerfile.template @@ -17,7 +17,7 @@ RUN set -x \ && gpg --batch --verify hawkbit-update-server.jar.asc hawkbit-update-server.jar \ && apk del build-dependencies -VOLUME "$HAWKBIT_HOME/data" +VOLUME "$HAWKBIT_HOME/artifactrepo" WORKDIR $HAWKBIT_HOME ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/0.2.0/KEY b/hawkbit-runtime/docker/dockerfiles/KEY similarity index 100% rename from hawkbit-runtime/docker/0.2.0/KEY rename to hawkbit-runtime/docker/dockerfiles/KEY diff --git a/hawkbit-runtime/docker/generator/template/KEY-mysql b/hawkbit-runtime/docker/dockerfiles/KEY-mysql similarity index 100% rename from hawkbit-runtime/docker/generator/template/KEY-mysql rename to hawkbit-runtime/docker/dockerfiles/KEY-mysql diff --git a/hawkbit-runtime/docker/dockerfiles/generate.sh b/hawkbit-runtime/docker/dockerfiles/generate.sh new file mode 100755 index 0000000000..9073e55d86 --- /dev/null +++ b/hawkbit-runtime/docker/dockerfiles/generate.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# +# Copyright (c) 2018 Bosch Software Innovations GmbH and others +# +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# + +set -euxo pipefail + +HAWKBIT_VERSION="0.3.0M9" +MARIADB_DRIVER_VERSION="3.1.4" +BASE_IMAGE="eclipse-temurin:17.0.9_9-jre-alpine" + +################################################## + +# +# rm ./Dockerfile ./Dockerfile-mysql +cp ./Dockerfile.template ./Dockerfile +cp ./Dockerfile-mysql.template ./Dockerfile-mysql + +sed -i '' -e "s/{{BASE_IMAGE}}/${BASE_IMAGE}/g; s/{{HAWKBIT_VERSION}}/$HAWKBIT_VERSION/g" ./Dockerfile +sed -i '' -e "s/{{HAWKBIT_VERSION}}/$HAWKBIT_VERSION/g; s/{{MARIADB_DRIVER_VERSION}}/$MARIADB_DRIVER_VERSION/g" ./Dockerfile-mysql diff --git a/hawkbit-runtime/docker/generator/generate.sh b/hawkbit-runtime/docker/generator/generate.sh deleted file mode 100755 index 723e62b812..0000000000 --- a/hawkbit-runtime/docker/generator/generate.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -set -euxo pipefail -# -# Copyright (c) 2018 Bosch Software Innovations GmbH and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# - -HAWKBIT_VERSION="0.3.0M7" -MARIADB_DRIVER_VERSION="2.7.2" -BASE_IMAGE="adoptopenjdk\/openjdk8:jre8u282-b08-alpine" - -################################################## - -mkdir -p "../$HAWKBIT_VERSION" && mkdir -p "../$HAWKBIT_VERSION-mysql" - -cp ./template/KEY "../$HAWKBIT_VERSION/KEY" -cp ./template/KEY-mysql "../$HAWKBIT_VERSION-mysql/KEY" - -cp ./template/Dockerfile "../$HAWKBIT_VERSION/Dockerfile" -cp ./template/Dockerfile-mysql "../$HAWKBIT_VERSION-mysql/Dockerfile" - -sed -i -e "s/{{BASE_IMAGE}}/${BASE_IMAGE}/g; s/{{HAWKBIT_VERSION}}/$HAWKBIT_VERSION/g" "../$HAWKBIT_VERSION/Dockerfile" -sed -i -e "s/{{HAWKBIT_VERSION}}/$HAWKBIT_VERSION/g; s/{{MARIADB_DRIVER_VERSION}}/$MARIADB_DRIVER_VERSION/g" "../$HAWKBIT_VERSION-mysql/Dockerfile" diff --git a/hawkbit-runtime/docker/generator/template/Dockerfile-mysql b/hawkbit-runtime/docker/generator/template/Dockerfile-mysql deleted file mode 100644 index 4710a20b0f..0000000000 --- a/hawkbit-runtime/docker/generator/template/Dockerfile-mysql +++ /dev/null @@ -1,15 +0,0 @@ -FROM hawkbit/hawkbit-update-server:{{HAWKBIT_VERSION}} - -ENV MARIADB_DRIVER_VERSION={{MARIADB_DRIVER_VERSION}} - -COPY KEY . - -RUN set -x \ - && apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget \ - && gpg --import KEY \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar --no-verbose https://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar \ - && wget -O $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc --no-verbose https://downloads.mariadb.com/Connectors/java/connector-java-$MARIADB_DRIVER_VERSION/mariadb-java-client-$MARIADB_DRIVER_VERSION.jar.asc \ - && gpg --verify --batch $JAVA_HOME/lib/ext/mariadb-java-client.jar.asc $JAVA_HOME/lib/ext/mariadb-java-client.jar \ - && apk del build-dependencies - -ENTRYPOINT ["java","-jar","hawkbit-update-server.jar","--spring.profiles.active=mysql","-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"] diff --git a/hawkbit-runtime/docker/generator/template/KEY b/hawkbit-runtime/docker/generator/template/KEY deleted file mode 100644 index 7a959f646d..0000000000 --- a/hawkbit-runtime/docker/generator/template/KEY +++ /dev/null @@ -1,79 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: SKS 1.1.6 -Comment: Hostname: pgp.mit.edu - -mQINBFflTWwBEAC9YoTvzZlCcQSrqPdovEmAlxlIKzPqE+06Pig87dcn+2PJDDnk9Rl9eDEH -CWKrds4mg7lVgzFApI73V7agHj9bqSyPWbp1GtReDvD4QKNEb4RM9XY8O1rStOTrznhfVIGc -oi9wKPTQWk5GXiqh6rawiyZnAfKm9WPZhKaxIi4m0zcTpJQ2dwbPi0hBpeEMJTyadId4Y+bB -AmH2qGKCOi2NXQDGDJ9BOkjLMVmPlgxnj8QBgZlUgRnVkYNjas/eVcXM5w6BQ884vUuSm35r -PelQOflmUAUiCGoE7UAhfrJdd5tOdWbn9bnCjv1eUyj2hJwJRRwRZjHvsvJygEg7T00Ntur3 -UN8fich29cjPGzjkilqK1NkRPZGROchn5MDhSoeUpGXEDL5bPAWHCNLqus6gMx5vNJ2IuNmW -rHSlsNy0pkWu88xtanjZjgX416nY7RPsmvZ1WRr04tegYB2CGO5aQWK1l+k6ciXWLqC23SAg -FE/2Edbzaxvc6jJi5cVGvvZAoH8J7wXCF0zFwORypNyXbNoiAQQnlW7LBJtJU6KihkuTjbDJ -1wmphLIdMoPTXLOxVVBTM7rsYa3ev9o9V9Z0dkAv364fO7zc/RpEoqM33NmNTzS8DUP/TF6J -UQftNJL+ExCreDqxlkyTgqf/+s/k1Z1kuYEKdRmk4MILVKGZvQARAQABtDFFY2xpcHNlIGhh -d2tCaXQgUHJvamVjdCA8aGF3a2JpdC1kZXZAZWNsaXBzZS5vcmc+iQEcBBABCAAGBQJX6nMW -AAoJEPqgpYKzPV/BDqEIAKAOy1JQjPccNwvZg8Y5OwW2QhB4lvq8ngzniSok/PAGdjsfVlJu -4zPgFkBcqgtAbXycOZXpMXQZBekfWslnDU7RtRAIZ6hJAuiJOL7qOOM3X03YHvq1HVWv2JK/ -g8NSoG1C2dw+GIsK2k4886QGX+a7pN7Mt0ZAbsVAaZx2Cig+iVc74+YW6UY6BiMOj1nGGSyG -9AT0pMgUWBbqvjpeKmiFzP5XVEL7e6pAS4jZAiYNp0xHPdYG/ANiq+hQAArmeaZa2hxOmygJ -CZvh6dYKBXMfRAQFBF8burVyhiJOV2Pn3kCxTSckaO63sZ+ayzBNrVu8Mpf0h2rIEGVVdWlx -KjyJARwEEAEIAAYFAlfrcXQACgkQZZoexg+SnXSfzQf7BWaH/x2yBzCmpbxpbUhI50bGvj6L -jasb6q68Q875ODwls9jve0ip0p7bcRwvbJ4Fd1OypwkxV3R/JdPlfkQwA4CoqHQpMOdN+iQ+ -aA8I86Z/dDL2yZS8e6cTdlRmIwC2RKAkNoy39t0P5UG3Zf6yiES0YaWB0zZQZwtBwNyOOPXD -1L2X/mKXT1yfLgc8YeBx+ojhr8LpzNZKA1vqyQ04YCYByMXy2FGqEaTHwbIZXFJ1IxIs956J -0SD929Nkw3m2/ZSONOLD0uMwb91A9lv9vRWU+bwp18S5j63N5NEEM6QsGOt9VgDhy01zdb46 -1e99V1IYkh863gCEHyJFOJi+RYkCHAQQAQgABgUCV+VPmAAKCRCforcpn1HlQ5VCD/9SxkSV -iV8sywK3cZm9lkYlnot33lAH/dYDf4md1mOf8vfNWTB0L9s5LOK9n6SWHdEKYd+f3OAP7ZM5 -Div30B/TmkyR4BgtMAkDOQSIR5+iEzXI2+iklEb1I+vhFVkKNOGoOaWRiDWZScWgwPBylYuj -iPjRAjKxtZuuhy5A4d6HkvdugoQ+4GdHeazkSeXLADz6XFBrQpUrTGCuNqdpE8QKkX4xmZ4L -Vvur3h/STBsJBfewuC4FhDTryFdd/vygivV7LrHzJlgTNqoK+oxL0wiietLtHvpwpS/gGcrq -a+8ccvPN+HhGCgpkeULEp8MUwp5fqoJxU57AZHUo/ER+6jmMSRz8V7M/VoZxwoGcH3o+paYw -GfxEPovaA6jadzEQomQTK3qsrx8nXflYPH39o3NYBM+MBLnsv6kndPqBb7OtBt2ZVges04zM -mbIYgpAUZgIOoCR75uU21DO2hbS7EHwd4nqY5vOfFSlMgtBcInjmXRiqDADspJv3938J/E2n -7M7ijERcQn6UmhCmdYLCLo2bAODp0mjjcftu6Ct65VLP1WRp95qr21VSDBoozwd9eL0AzAoC -SOhZPmDoeFoo3QcekEi4gxRtQvSdEZ0YteUENXmpSX+c/IKba5lpk4baC52HvhlNlmeu0DxX -VWqYF7O/9Z4hl2lQ5LHiSb2L0S1+6YkCPQQTAQgAJwUCV+VNbAIbLwUJCWYBgAULCQgHAwUV -CgkICwUWAgMBAAIeAQIXgAAKCRA4XLwcf2Z/rujfD/0Wp1uYXRsAzEcZavASh1Xe2301atbU -aRUy8UsNWO5oCvVjyyaPM4c3MT72sqsLyNXAWhi/MP63M0qr2+M0nN/91U8r98/Mbd+WlzRy -CLJYUX72Oqrfan+hZxcd7Xlu+sKHNshOlCy4114bVnrdq16LfeIAkx7GLw9/lMc9lRrvUwMI -684zhquROpuDD1aE/i/gBGgzd8cMoW+hdjFVA0zwe+6FgrWR2CMiKCJfeYWLuFiBNmFZC6l8 -BqiEqCuyQu6dFpWHhtK3fPJAEYIiNkORT8M3HSXl/Ex/w9ErweZKHiSja7KMAUWXkZi+Ayva -jMVI4jumXwgZW/7uuSc6bbv2SO4BSfMHvFtEuBSBWXi9e0urgqNOFQuKE7zokSbEStwG4+gN -E32ZuS2sllOxr41Nx/q2oKMeKePZBqoD5+3mDtRP432KWZjZjlhyez0Kh8aJ8lz5MM7Xxtzo -OyJeO4JHqbuBV82GvoLXVsYJBOUfRuBaZQcphUjamZwDZQFEvoKe6Ltur6+gsqu4UsQzs2bp -i26yaP3e1mrLc9Q5KAH7EkOr7wD3zo7jtJ21luGCBOtZ113oWJZgAwaevDC6cY/k32YgK8+q -iqMtNC7APznXyN4eVjKB18aSM7rVNdE8vlA818b7DbKXsqjH9N7VdiW2/4F8TJNq+OCVPjMf -pfM3KLkCDQRX6R/1ARAAplIU5GesaA42f8+idIEnozpd7aJKs8PuaOUUWr/7CmozpHNXpjPP -uPRflSRmFBeigp50xNfpLwYXjbjoVaiqdPKp6rxko0kh6NcG+pXYvCZOvWaM3e04xppREeiF -UNq8XctterVqWKC5zOgE1wY0346BgWtJvcYL9px71w2EE0bsZ/gwuphOYRblLtbmsKLwheMQ -JO2wfusPsAEGDdoaTRenEmosi/DRWt+oxodZSWygETk8fPESqcvmnjhPpVvCHksdIWEqUBXy -rg6NkkyIjLdMqeuBp/IrUN1XGBOrUgdVNpCNuiMN1Ai+6L9g364fLP7xYB84kLK+QSO03Bpv -j+D5Ca2DRweTmTaCQzaOeR2KW9kgf2tbLJbIoM2OiXLcfGN5bPvZVc2ODverOCRDiVwcVkd+ -sfbG3sUkyV+1NSYTJYTRnaNjsQmNGBfI0mI7v0zEHVt+X0tuJeP5QcMJ1lvLqBiZgZQDFVg4 -vtchDLFTv2JlLfsbyG+U2f2iLA3mauyFRS+x1ZFeIENsXwSqLn1WXvslnkV8cTs4hTFb1Skj -zC89XbjY2PUJMg2XWLeWjvv6pVGvdRVlPuujbou93SMfPSdYPqOrX4eX42I66GXuXMczbu9H -F8kk7OpyP9cYo8LpiHjuxHm/VMFLckagluXwZCl6uiIRB+IJJmd+2jcAEQEAAYkERAQYAQgA -DwUCV+kf9QIbAgUJCWYBgAIpCRA4XLwcf2Z/rsFdIAQZAQgABgUCV+kf9QAKCRBjMbgT6Sl8 -4NSbD/9ueOFntw+rs2q7hAGOq2LP3D/d7SuU+j8vUcszJK2ETQlKX9IcQs3c+T4AbpQ4O5Ea -EvvYEAVmPjosk9zn7sxiWrzvDbvfhQK6hR6zbBK2LB7yTkzBh3oT8WghbCqeTDqJMl47PUv5 -yUVsX4RHmbgo7qymRGiPJ8a+5QPOmtmdoyaEv0hGvszya4aTKexLM4fU+k+e8kupY9fTICE7 -S7zUpX7hpFYC4d/uk3KUkCvebox2C4UomT2kV518/Pnj/6wpWQ3GHnqIurMPOW097VsP3epl -jutNwXM3sH6rbgiiZqdQFb3bq1Da4fpNqnH6Rdm7fSjjV2R36qDrPQz/AfZC2fouq2Xbse6M -RKR48peb80cvtGqhc2J7FHWfEu8da/26Gxq07SOod9svR8eBcJAnlCd3Hca0T2qmaM52WvC+ -Mjxsjgg6yGh0PenjsNQM2mdhvKUflqbLluY4E2QPHVJZlT3Bo5LekM91ZZAgd4F3xBE25/WL -Akg2/rsCiulAfaEXAPQkqCaB7ajd9dvJXcq5qvWSvSgW5vL/nnyecE5ktf8todaMhMz83gpt -eXtR8Ms7401d2Qwt28NifXkgEMMNfytXg/0TO6F0uRGi67SoAeadUjug2JSr7LBmeQHyOvLR -q+0iO1m3f3pSSduqBjKWUFnJShED8FafaRUrE1+HWN2lD/0Sci1X33CrTXNSQCzdTaD3R/SJ -B+BSspEQNV/JqAPjJD9ZK3dwDm5upmrjpFNjSVvcQJoy0J1rW2q2E8y8ECuxErUWQqyFv/Co -y39WpwgWam19ykP3yNiU9UHGb58DhuMRwLOYF7o5Iwg2nbiYtHO5jSmC3PPpYz3TLvA/kSTK -1T1m6ac2dA6UMLn3t3Cohv50wpr41bxLz04ig/dEmrdP72HRpA5oNoXAXCaCeeed5R1DfxgW -RL2fP+GL6ZftTplw3AL2trJa+0zLFHvDo+M4c1brM2x0HYEoX+qSpFMxtixgV0D5Uf7RUMkN -eYPb4SZRc6wDHIt7Wqp/qlUozC94DKbFUrK4UnHyK4+HVlSQJGevqm+Y+QoqIBcnhOEN0Bzo -01aVHIZFxzk4R2bppFEDiFEw1zL2DAPj/xX7Zqrjsg/qdVu9bUklBxir6QSOwZGZMGYCuBWM -uJU3IY7Xzx/6Anm5oqbXLVLwVFwS8tED+/XYjPUo1ifLGVx96THuQrNBMhpwNE/9Qd4zbjnE -7f6foXLgeB/l2h65zrI6O1RdEAUpA8Tuhgy0PwNc/1mviaOkYx9qFlhyjruTd72TV4va+5Qb -L7wnh417OQNbpWUqb5HvN5BruDFQOBztFupi/7LHWnSX4XVO777SYzlf1a7DdJu45cql44d2 -LrdPYOGtAA== -=a0Oj ------END PGP PUBLIC KEY BLOCK----- diff --git a/hawkbit-runtime/hawkbit-update-server/pom.xml b/hawkbit-runtime/hawkbit-update-server/pom.xml index f96471bb17..eaedc4542a 100644 --- a/hawkbit-runtime/hawkbit-update-server/pom.xml +++ b/hawkbit-runtime/hawkbit-update-server/pom.xml @@ -1,135 +1,166 @@ - 4.0.0 - - org.eclipse.hawkbit - hawkbit-runtime-parent - 0.3.0-SNAPSHOT - - hawkbit-update-server - hawkBit :: Runtime :: Update Server + 4.0.0 + + org.eclipse.hawkbit + hawkbit-runtime-parent + 0.3.0-SNAPSHOT + + hawkbit-update-server + hawkBit :: Runtime :: Update Server + + + + docker + + + + io.fabric8 + docker-maven-plugin + + + + + + attach-artifacts-profile + + + + !skipTests + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + package + + attach-artifact + + + + + ${project.build.directory}/rest-api/mgmt-openapi.json + json + mgmt-openapi + + + ${project.build.directory}/rest-api/mgmt-openapi.yaml + yaml + mgmt-openapi + + + ${project.build.directory}/rest-api/ddi-openapi.json + json + ddi-openapi + + + ${project.build.directory}/rest-api/ddi-openapi.yaml + yaml + ddi-openapi + + + + + + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + ${baseDir} + org.eclipse.hawkbit.app.Start + JAR + + + + + + + + + src/main/resources + + + + + + + org.eclipse.hawkbit + hawkbit-boot-starter + ${project.version} + + + com.h2database + h2 + + + com.microsoft.sqlserver + mssql-jdbc + + + org.postgresql + postgresql + - - - docker - - - - io.fabric8 - docker-maven-plugin - - - - - - - - + + + io.qameta.allure + allure-junit5 + test + + org.springframework.boot - spring-boot-maven-plugin - - - - repackage - build-info - - - ${baseDir} - org.eclipse.hawkbit.app.Start - JAR - - - - - - pl.project13.maven - git-commit-id-plugin - 4.9.10 - - - - - src/main/resources - - - + spring-boot-starter-test + test + + + org.springframework.security + spring-security-test + test + + + org.mariadb.jdbc + mariadb-java-client + test + + + org.eclipse.hawkbit + hawkbit-repository-test + ${project.version} + test + + + io.micrometer + micrometer-core + 1.9.13 + + - - - org.eclipse.hawkbit - hawkbit-boot-starter - ${project.version} - - - com.h2database - h2 - - - com.microsoft.sqlserver - mssql-jdbc - - - org.postgresql - postgresql - - - mysql - mysql-connector-java - 8.0.21 - - - org.springframework.boot - spring-boot-starter-actuator - - - io.micrometer - micrometer-core - 1.8.1 - - - - io.qameta.allure - allure-junit5 - test - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.security - spring-security-test - test - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.eclipse.hawkbit - hawkbit-repository-test - ${project.version} - test - - - org.springframework.cloud - spring-cloud-starter-stream-rabbit - - - org.eclipse.hawkbit - hawkbit-extension-artifact-repository-s3 - 0.3.0M7 - - diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/ErrorController.java b/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/ErrorController.java index 9509bd8de9..c12ce1a6eb 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/ErrorController.java +++ b/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/ErrorController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.app; diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java b/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java index a99c6c1b16..dab0798aec 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java +++ b/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.app; diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/MyUI.java b/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/MyUI.java index 1a3cf138dc..9f3bab5ab4 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/MyUI.java +++ b/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/MyUI.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.app; diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java b/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java index 020502f03e..b7400b64c5 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java +++ b/hawkbit-runtime/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.app; diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties index ec80a5477d..b526f6dad5 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties +++ b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-cloudsandbox.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2018 Bosch Software Innovations GmbH and others. +# Copyright (c) 2018 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # server.forward-headers-strategy=NATIVE diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-db2.properties b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-db2.properties index a0a3bd2b1e..16a0fa0b8c 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-db2.properties +++ b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-db2.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2019 Bosch Software Innovations GmbH and others. +# Copyright (c) 2019 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # This profile adds basic configurations for a DB2 DB usage. diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mssql.properties b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mssql.properties index ddcf708648..a00c95aa8e 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mssql.properties +++ b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mssql.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2018 Bosch Software Innovations GmbH and others. +# Copyright (c) 2018 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # This profile adds basic configurations for a Microsoft SQL Server DB usage. diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mysql.properties b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mysql.properties index e49989df36..979fec5630 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mysql.properties +++ b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-mysql.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. +# Copyright (c) 2015 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # This profile adds basic configurations for a MySQL DB usage. diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-postgresql.properties b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-postgresql.properties index 3e8e15e7ef..89fb4468ee 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-postgresql.properties +++ b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application-postgresql.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2020 Enapter Co.,Ltd. +# Copyright (c) 2020 Enapter Co.,Ltd # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # This profile adds basic configurations for a PostgreSQL usage. diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties index 12de2b451e..eb3d01d77e 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties +++ b/hawkbit-runtime/hawkbit-update-server/src/main/resources/application.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. +# Copyright (c) 2015 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # User Security @@ -49,4 +50,14 @@ management.endpoints.web.exposure.include=httptrace,info # Add useful app info to /info endpoint info.app.description=Eclipse hawkBit is a domain independent back-end framework for rolling out software updates to constrained edge devices as well as more powerful controllers and gateways connected to IP based networking infrastructure. -info.app.release=0.3.0M7 \ No newline at end of file +info.app.release=0.3.0 + +# Swagger Configuration +#springdoc.swagger-ui.path=/update-server-documentation +#springdoc.api-docs.path=/update-server-api-docs +springdoc.show-oauth2-endpoints=true +springdoc.api-docs.version=openapi_3_0 +springdoc.show-login-endpoint=true +springdoc.packages-to-scan=org.eclipse.hawkbit.mgmt,org.eclipse.hawkbit.ddi +springdoc.swagger-ui.oauth2RedirectUrl=/login/oauth2/code/suite +springdoc.paths-to-exclude=/system/** \ No newline at end of file diff --git a/hawkbit-runtime/hawkbit-update-server/src/main/resources/logback-spring.xml b/hawkbit-runtime/hawkbit-update-server/src/main/resources/logback-spring.xml index b107265a62..b71e34118f 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/main/resources/logback-spring.xml +++ b/hawkbit-runtime/hawkbit-update-server/src/main/resources/logback-spring.xml @@ -1,12 +1,13 @@ diff --git a/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AbstractSecurityTest.java b/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AbstractSecurityTest.java index f28d301fc4..fc1355a75d 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AbstractSecurityTest.java +++ b/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AbstractSecurityTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.app; diff --git a/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AllowedHostNamesTest.java b/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AllowedHostNamesTest.java index a7a33b9155..6245128281 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AllowedHostNamesTest.java +++ b/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/AllowedHostNamesTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.app; diff --git a/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/CorsTest.java b/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/CorsTest.java index 7217b489ce..8ba879f351 100644 --- a/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/CorsTest.java +++ b/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/CorsTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.app; diff --git a/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/RestApiDocTest.java b/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/RestApiDocTest.java new file mode 100644 index 0000000000..990a645939 --- /dev/null +++ b/hawkbit-runtime/hawkbit-update-server/src/test/java/org/eclipse/hawkbit/app/RestApiDocTest.java @@ -0,0 +1,155 @@ +/** + * Copyright (c) 2023 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + */ + +package org.eclipse.hawkbit.app; + +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.dataformat.yaml.YAMLMapper; +import org.eclipse.hawkbit.repository.test.util.SharedSqlTestDatabaseExtension; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.http.ResponseEntity; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@ExtendWith({SharedSqlTestDatabaseExtension.class}) +class RestApiDocTest { + private static final String MANAGEMENT_PREFIX = "mgmt-openapi"; + private static final String DDI_PREFIX = "ddi-openapi"; + private static final String TARGET_DIRECTORY = "target/rest-api/"; + + @LocalServerPort + private int port; + + @Autowired + private TestRestTemplate restTemplate; + + private final ObjectMapper objectMapper = new ObjectMapper(); + + @Test + void openapiJson() throws IOException { + ResponseEntity response = + restTemplate.getForEntity("http://localhost:" + port + "/v3/api-docs", String.class); + String openapiDoc = response.getBody(); + assertThat(openapiDoc).isNotNull(); + splitDocumentation(openapiDoc); + } + + private void splitDocumentation(String json) throws IOException { + processDocumentation(json, true); + processDocumentation(json, false); + } + + private void processDocumentation(String json, boolean isMgmt) throws IOException { + JsonNode rootNode = objectMapper.readTree(json); + updateJsonNodeForApi(rootNode, isMgmt); + saveDocumentation(rootNode, isMgmt); + } + + private void updateJsonNodeForApi(JsonNode rootNode, boolean isMgmt) { + removeTags(rootNode, isMgmt); + removePaths(rootNode, isMgmt); + removeComponents(rootNode, isMgmt); + } + + private void removeTags(JsonNode rootNode, boolean isMgmt) { + ArrayNode tagsNode = (ArrayNode) rootNode.get("tags"); + ArrayNode modifiedTagsNode = objectMapper.createArrayNode(); + + for (JsonNode tagNode : tagsNode) { + String tagName = tagNode.get("name").asText(); + if (isMgmt != tagName.startsWith("DDI")) { + modifiedTagsNode.add(tagNode); + } + } + + ((ObjectNode) rootNode).set("tags", modifiedTagsNode); + } + private void removePaths(JsonNode rootNode, boolean isMgmt) { + ObjectNode pathsNode = (ObjectNode) rootNode.get("paths"); + List fieldsToRemove = new ArrayList<>(); + pathsNode.fieldNames().forEachRemaining(fieldName -> { + JsonNode pathNode = pathsNode.get(fieldName); + pathNode.fieldNames().forEachRemaining(path -> { + JsonNode methodNode = pathNode.get(path); + JsonNode tagsNode = methodNode.get("tags"); + if (tagsNode != null) { + for (JsonNode tagNode : tagsNode) { + String tag = tagNode.asText(); + if (isMgmt == tag.startsWith("DDI")) { + fieldsToRemove.add(fieldName); + break; + } + } + } + }); + }); + fieldsToRemove.forEach(pathsNode::remove); + } + + private void removeComponents(JsonNode rootNode, boolean isMgmt) { + ObjectNode schemasNode = (ObjectNode) rootNode.get("components").get("schemas"); + + List fieldsToRemove = new ArrayList<>(); + schemasNode.fieldNames().forEachRemaining(fieldName -> { + if (shouldDeleteComponent(fieldName, isMgmt)) { + fieldsToRemove.add(fieldName); + } + }); + fieldsToRemove.forEach(schemasNode::remove); + } + + private boolean shouldDeleteComponent(String fieldName, boolean isMgmt) { + if (isMgmt) { + return fieldName.startsWith("Ddi"); + } + return !(fieldName.startsWith("Ddi") || fieldName.equals("Link") || fieldName.equals("ExceptionInfo")); + + } + + private void saveDocumentation(JsonNode rootNode, boolean isMgmt) throws IOException { + String prefix = isMgmt ? MANAGEMENT_PREFIX : DDI_PREFIX; + saveAsJson(rootNode, prefix); + saveAsYaml(rootNode, prefix); + } + + private void saveAsJson(JsonNode rootNode, String prefix) throws IOException { + Path targetPath = getTargetPath(prefix, ".json"); + Files.writeString(targetPath, objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(rootNode)); + } + + private void saveAsYaml(JsonNode rootNode, String prefix) throws IOException { + YAMLMapper yamlMapper = new YAMLMapper(); + Path targetPath = getTargetPath(prefix, ".yaml"); + Files.writeString(targetPath, yamlMapper.writeValueAsString(rootNode)); + } + + private Path getTargetPath(String prefix, String extension) throws IOException { + Path targetPath = Paths.get(TARGET_DIRECTORY + prefix + extension); + Files.createDirectories(targetPath.getParent()); + return targetPath; + } +} + diff --git a/hawkbit-runtime/pom.xml b/hawkbit-runtime/pom.xml index df36a3c0d2..4a1dbe06f6 100644 --- a/hawkbit-runtime/pom.xml +++ b/hawkbit-runtime/pom.xml @@ -1,11 +1,12 @@ diff --git a/hawkbit-security-core/pom.xml b/hawkbit-security-core/pom.xml index f5498b2030..6384f77df3 100644 --- a/hawkbit-security-core/pom.xml +++ b/hawkbit-security-core/pom.xml @@ -1,11 +1,12 @@ diff --git a/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml b/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml index 0a5603db55..76d4c24432 100644 --- a/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml +++ b/hawkbit-starters/hawkbit-boot-starter-mgmt-api/pom.xml @@ -1,11 +1,12 @@ diff --git a/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml b/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml index ad07d7b3ac..673b65c0bd 100644 --- a/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml +++ b/hawkbit-starters/hawkbit-boot-starter-mgmt-ui/pom.xml @@ -1,11 +1,12 @@ diff --git a/hawkbit-starters/hawkbit-boot-starter/pom.xml b/hawkbit-starters/hawkbit-boot-starter/pom.xml index 5c4ad1ad06..5cbbb57408 100644 --- a/hawkbit-starters/hawkbit-boot-starter/pom.xml +++ b/hawkbit-starters/hawkbit-boot-starter/pom.xml @@ -1,11 +1,12 @@ hawkbit-rest-core ${project.version} - - org.eclipse.hawkbit - hawkbit-rest-docs - ${project.version} - org.eclipse.hawkbit hawkbit-dmf-amqp diff --git a/hawkbit-test-report/src/main/resources/assemblies/test-report.xml b/hawkbit-test-report/src/main/resources/assemblies/test-report.xml index c4689825c9..974d6b6d1d 100644 --- a/hawkbit-test-report/src/main/resources/assemblies/test-report.xml +++ b/hawkbit-test-report/src/main/resources/assemblies/test-report.xml @@ -1,11 +1,12 @@ diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AbstractHawkbitUI.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AbstractHawkbitUI.java index da6905235f..8a2a5f0e3e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AbstractHawkbitUI.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AbstractHawkbitUI.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AppWidgetSet.gwt.xml b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AppWidgetSet.gwt.xml index f17be58179..429501bd66 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AppWidgetSet.gwt.xml +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/AppWidgetSet.gwt.xml @@ -1,12 +1,13 @@ diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitEntityEventListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitEntityEventListener.java index f824c582ec..b3009af4c6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitEntityEventListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/HawkbitEntityEventListener.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/LocalizedSystemMessagesProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/LocalizedSystemMessagesProvider.java index c8b1986ab6..2c2ff96b45 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/LocalizedSystemMessagesProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/LocalizedSystemMessagesProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/MgmtUiConfiguration.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/MgmtUiConfiguration.java index 777f0dbec0..2167985af0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/MgmtUiConfiguration.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/MgmtUiConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/SpPermissionChecker.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/SpPermissionChecker.java index db81ebf28f..2316212d65 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/SpPermissionChecker.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/SpPermissionChecker.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java index 0829b8f870..5df9fe8d3a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/UiProperties.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/ArtifactUploadState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/ArtifactUploadState.java index 52fc630ca2..4fb6332ae0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/ArtifactUploadState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/ArtifactUploadState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java index b9577cb685..7af5f7302c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactViewMenuItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactViewMenuItem.java index 9f943d4b26..6ba56c5fa5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactViewMenuItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/UploadArtifactViewMenuItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGrid.java index 4cd8b43206..a0c6ad1023 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.details; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGridHeader.java index 55e54571b3..fe90b5a98e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.details; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGridLayout.java index 3b71544681..64a73e322e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.details; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGridLayoutUiState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGridLayoutUiState.java index 0eef4d8c53..b92beab70f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGridLayoutUiState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/details/ArtifactDetailsGridLayoutUiState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.details; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/AddSmWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/AddSmWindowController.java index a1193c5d77..82da93aad2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/AddSmWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/AddSmWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/ProxySmValidator.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/ProxySmValidator.java index 66e734cedd..22f3cb6ee5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/ProxySmValidator.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/ProxySmValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmMetaDataAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmMetaDataAddUpdateWindowLayout.java index dc7e2f0b94..0466564aa0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmMetaDataAddUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmMetaDataAddUpdateWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmMetaDataWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmMetaDataWindowBuilder.java index 01606aed98..caf4448ec2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmMetaDataWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmMetaDataWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmMetaDataWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmMetaDataWindowLayout.java index 507a2d1a10..0e525f918f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmMetaDataWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmMetaDataWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmWindowBuilder.java index 0a158b1da2..7ced71d04f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmWindowLayout.java index b561a8d19e..584e8d5849 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmWindowLayoutComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmWindowLayoutComponentBuilder.java index e07a3e6a68..18e9c0b85d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmWindowLayoutComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SmWindowLayoutComponentBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleGrid.java index a9cf4d02c5..f589940d72 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleGridHeader.java index 64e49c9a82..d04dfe4cf0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleGridLayout.java index f29a63ff90..51e9e81ec9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/SoftwareModuleGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/UpdateSmWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/UpdateSmWindowController.java index 12f2ddc633..d7afa176ad 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/UpdateSmWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtable/UpdateSmWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/AddSmTypeWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/AddSmTypeWindowController.java index c8cc59bd55..12c079407d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/AddSmTypeWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/AddSmTypeWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SmTypeWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SmTypeWindowBuilder.java index 422af5420a..641adcd557 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SmTypeWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SmTypeWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SmTypeWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SmTypeWindowLayout.java index fa23354a5c..ba42de8137 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SmTypeWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SmTypeWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SmTypeWindowLayoutComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SmTypeWindowLayoutComponentBuilder.java index 77622a52e8..09aea360e3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SmTypeWindowLayoutComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/SmTypeWindowLayoutComponentBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/UpdateSmTypeWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/UpdateSmTypeWindowController.java index dbe1ffd08a..ae026c8cdc 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/UpdateSmTypeWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/UpdateSmTypeWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/filter/SMTypeFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/filter/SMTypeFilterButtons.java index f90f57c9b3..84d0e73d3b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/filter/SMTypeFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/filter/SMTypeFilterButtons.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtype.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/filter/SMTypeFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/filter/SMTypeFilterHeader.java index cee6b5a67a..440fac5617 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/filter/SMTypeFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/filter/SMTypeFilterHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtype.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/filter/SMTypeFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/filter/SMTypeFilterLayout.java index d6f8510dfd..0b410e23ac 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/filter/SMTypeFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/smtype/filter/SMTypeFilterLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.smtype.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/AbstractFileTransferHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/AbstractFileTransferHandler.java index f1116696bb..de6acfe032 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/AbstractFileTransferHandler.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/AbstractFileTransferHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.upload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileTransferHandlerStreamVariable.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileTransferHandlerStreamVariable.java index b3aee2e5ac..d681872fa9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileTransferHandlerStreamVariable.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileTransferHandlerStreamVariable.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.upload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileTransferHandlerVaadinUpload.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileTransferHandlerVaadinUpload.java index 81a16a27a7..77d97a8d23 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileTransferHandlerVaadinUpload.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileTransferHandlerVaadinUpload.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.upload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileUploadId.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileUploadId.java index 3639c551e7..9116ba18ec 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileUploadId.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileUploadId.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.upload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileUploadProgress.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileUploadProgress.java index ad9cb04fa3..381e3165a6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileUploadProgress.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/FileUploadProgress.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.upload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadDropAreaLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadDropAreaLayout.java index 9a7e03b812..baec4a86b0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadDropAreaLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadDropAreaLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.upload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadFixed.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadFixed.java index 56e4ab9b2c..a934fba041 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadFixed.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadFixed.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.upload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadProgressButtonLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadProgressButtonLayout.java index f0b5bbe44c..c2c73c8a2a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadProgressButtonLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadProgressButtonLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.upload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadProgressGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadProgressGrid.java index a421ad1901..58c924ff98 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadProgressGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadProgressGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.upload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadProgressInfoWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadProgressInfoWindow.java index 356d897feb..25f4c5dce0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadProgressInfoWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadProgressInfoWindow.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.upload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/autoconfigure/MgmtUiAutoConfiguration.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/autoconfigure/MgmtUiAutoConfiguration.java index 417c88d7e2..05a1463287 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/autoconfigure/MgmtUiAutoConfiguration.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/autoconfigure/MgmtUiAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.autoconfigure; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/autoconfigure/RedirectController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/autoconfigure/RedirectController.java index ef902cd347..a9ddfacff2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/autoconfigure/RedirectController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/autoconfigure/RedirectController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.autoconfigure; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/autoconfigure/UISecurityConfigurationAdapter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/autoconfigure/UISecurityConfigurationAdapter.java index 01e50b365d..953d281f28 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/autoconfigure/UISecurityConfigurationAdapter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/autoconfigure/UISecurityConfigurationAdapter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.autoconfigure; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractAddEntityWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractAddEntityWindowController.java index e87f68d781..eaff243c48 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractAddEntityWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractAddEntityWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractAddNamedEntityWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractAddNamedEntityWindowController.java index 5568044d58..fa7a417bcd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractAddNamedEntityWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractAddNamedEntityWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEntityWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEntityWindowBuilder.java index d8f7d6dcb3..97cdd0799b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEntityWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEntityWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEntityWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEntityWindowController.java index 5e3821b520..04cbb6f3ad 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEntityWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEntityWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEntityWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEntityWindowLayout.java index 51a8c9a211..262353607b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEntityWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEntityWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEventListenersAwareView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEventListenersAwareView.java index f88e0c9625..f122b8eaa3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEventListenersAwareView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractEventListenersAwareView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractUpdateEntityWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractUpdateEntityWindowController.java index 33ab2be100..69f1ae2102 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractUpdateEntityWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractUpdateEntityWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractUpdateNamedEntityWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractUpdateNamedEntityWindowController.java index cfa3af6226..9afebf2c2a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractUpdateNamedEntityWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/AbstractUpdateNamedEntityWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java index 9cc0c8329f..2a92878f4c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonUiDependencies.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonUiDependencies.java index dda6d6f887..a1a2b0466c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonUiDependencies.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonUiDependencies.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/ConfirmationDialog.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/ConfirmationDialog.java index 3070314895..77a9c0a304 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/ConfirmationDialog.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/ConfirmationDialog.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CoordinatesToColor.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CoordinatesToColor.java index 874108bb94..7b52490bda 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CoordinatesToColor.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CoordinatesToColor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/EntityValidator.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/EntityValidator.java index 3080cac487..41d0738c38 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/EntityValidator.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/EntityValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/EntityWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/EntityWindowLayout.java index e2160eb904..4b4d048f43 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/EntityWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/EntityWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/EventListenersAwareLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/EventListenersAwareLayout.java index d6c63adbe7..fb072c26d5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/EventListenersAwareLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/EventListenersAwareLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java index 4de3bb92a0..dc2ce8eb1a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/UserDetailsFormatter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/ViewNameAware.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/ViewNameAware.java index 176116440e..d53a6eebb6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/ViewNameAware.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/ViewNameAware.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/AbstractTextFieldBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/AbstractTextFieldBuilder.java index c56cd38b9a..3f3ee350db 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/AbstractTextFieldBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/AbstractTextFieldBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.builder; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/BoundComponent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/BoundComponent.java index bc06cd5253..fb11a214e9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/BoundComponent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/BoundComponent.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.builder; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/FormComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/FormComponentBuilder.java index 2bf4352969..f50b7bc43b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/FormComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/FormComponentBuilder.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.builder; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/GridComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/GridComponentBuilder.java index bcec34b0eb..5fd7f6353c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/GridComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/GridComponentBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.builder; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/LabelBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/LabelBuilder.java index 1bc1368239..9b43607e0c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/LabelBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/LabelBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.builder; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/StatusIconBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/StatusIconBuilder.java index ce86adba74..bcad0c391a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/StatusIconBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/StatusIconBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.builder; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/TextAreaBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/TextAreaBuilder.java index a3acca49ac..5c946511b7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/TextAreaBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/TextAreaBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.builder; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/TextFieldBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/TextFieldBuilder.java index a6b824abc8..48a5869aae 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/TextFieldBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/TextFieldBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.builder; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/WindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/WindowBuilder.java index 033245c16b..b1f55d956b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/WindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/builder/WindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.builder; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/ActionTypeAware.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/ActionTypeAware.java index 1c7dae9191..81f455a43c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/ActionTypeAware.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/ActionTypeAware.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.aware; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/DescriptionAware.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/DescriptionAware.java index b9811d15ad..769cb072ae 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/DescriptionAware.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/DescriptionAware.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.aware; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/DsIdAware.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/DsIdAware.java index a433b9af1b..cd50d63850 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/DsIdAware.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/DsIdAware.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.aware; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/NameAware.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/NameAware.java index 71abac6ad4..db8457caf6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/NameAware.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/NameAware.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.aware; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/StartOptionAware.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/StartOptionAware.java index e3930ab87a..7586c693b4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/StartOptionAware.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/StartOptionAware.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.aware; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/TargetFilterQueryAware.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/TargetFilterQueryAware.java index 8abfcac702..338e7493eb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/TargetFilterQueryAware.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/TargetFilterQueryAware.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.aware; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/TypeInfoAware.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/TypeInfoAware.java index 998bcd7906..d41d84f658 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/TypeInfoAware.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/TypeInfoAware.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.aware; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/VersionAware.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/VersionAware.java index ca8fab0392..822d667d5e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/VersionAware.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/aware/VersionAware.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.aware; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsDistributionsFilterParams.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsDistributionsFilterParams.java index d8463aeeb1..0d53e29a7c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsDistributionsFilterParams.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsDistributionsFilterParams.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.filters; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsFilterParams.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsFilterParams.java index 6a9d7db4f7..d501386e5b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsFilterParams.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsFilterParams.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.filters; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsManagementFilterParams.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsManagementFilterParams.java index b5455e46e9..f2ef308800 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsManagementFilterParams.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/DsManagementFilterParams.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.filters; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/SwFilterParams.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/SwFilterParams.java index f66ed7616a..b59329a034 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/SwFilterParams.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/SwFilterParams.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.filters; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/TargetManagementFilterParams.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/TargetManagementFilterParams.java index 0c0885b414..86a8359d66 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/TargetManagementFilterParams.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/filters/TargetManagementFilterParams.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.filters; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/AbstractNamedEntityToProxyNamedEntityMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/AbstractNamedEntityToProxyNamedEntityMapper.java index 201668c450..3f2ba88e6b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/AbstractNamedEntityToProxyNamedEntityMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/AbstractNamedEntityToProxyNamedEntityMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/ActionStatusToProxyActionStatusMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/ActionStatusToProxyActionStatusMapper.java index b1ae344d58..a2769d5bc2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/ActionStatusToProxyActionStatusMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/ActionStatusToProxyActionStatusMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/ActionToProxyActionMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/ActionToProxyActionMapper.java index c08fa4098b..9926a86297 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/ActionToProxyActionMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/ActionToProxyActionMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/AdvancedRolloutGroupDefinitionToCreateMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/AdvancedRolloutGroupDefinitionToCreateMapper.java index 2ee6df9359..7e814c44a4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/AdvancedRolloutGroupDefinitionToCreateMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/AdvancedRolloutGroupDefinitionToCreateMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/ArtifactToProxyArtifactMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/ArtifactToProxyArtifactMapper.java index 2c6bf664bc..c0f36b7231 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/ArtifactToProxyArtifactMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/ArtifactToProxyArtifactMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/AssignedSoftwareModuleToProxyMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/AssignedSoftwareModuleToProxyMapper.java index 0fae049a92..1d52f1b60b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/AssignedSoftwareModuleToProxyMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/AssignedSoftwareModuleToProxyMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/DistributionSetToProxyDistributionMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/DistributionSetToProxyDistributionMapper.java index ce60bd81dc..ca7de66f6f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/DistributionSetToProxyDistributionMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/DistributionSetToProxyDistributionMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/IdentifiableEntityToProxyIdentifiableEntityMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/IdentifiableEntityToProxyIdentifiableEntityMapper.java index f1a65180d3..efe363c4f2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/IdentifiableEntityToProxyIdentifiableEntityMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/IdentifiableEntityToProxyIdentifiableEntityMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/NamedEntityToProxyNamedEntityMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/NamedEntityToProxyNamedEntityMapper.java index 58cf16450f..0bb3142434 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/NamedEntityToProxyNamedEntityMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/NamedEntityToProxyNamedEntityMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutGroupToAdvancedDefinitionMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutGroupToAdvancedDefinitionMapper.java index 58664a6270..46d8c0f8b1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutGroupToAdvancedDefinitionMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutGroupToAdvancedDefinitionMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutGroupToProxyRolloutGroupMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutGroupToProxyRolloutGroupMapper.java index d3c83bfe1f..ade30b5691 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutGroupToProxyRolloutGroupMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutGroupToProxyRolloutGroupMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutToProxyRolloutMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutToProxyRolloutMapper.java index b29d8564a2..65493ca1f3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutToProxyRolloutMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/RolloutToProxyRolloutMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/SoftwareModuleToProxyMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/SoftwareModuleToProxyMapper.java index c3e6101761..dbaa7d4f58 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/SoftwareModuleToProxyMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/SoftwareModuleToProxyMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TagToProxyTagMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TagToProxyTagMapper.java index 9e6643fdfa..7cecc8850f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TagToProxyTagMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TagToProxyTagMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetFilterQueryToProxyTargetFilterMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetFilterQueryToProxyTargetFilterMapper.java index 8b8b7dd835..fcd6599e55 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetFilterQueryToProxyTargetFilterMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetFilterQueryToProxyTargetFilterMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetToProxyTargetMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetToProxyTargetMapper.java index bfbb81ee1d..bd5e4505e7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetToProxyTargetMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetToProxyTargetMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetTypeToProxyTargetTypeMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetTypeToProxyTargetTypeMapper.java index a4c62e3a58..882c6462fb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetTypeToProxyTargetTypeMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetTypeToProxyTargetTypeMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetTypeToTypeInfoMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetTypeToTypeInfoMapper.java index f20e794e49..af6da655ef 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetTypeToTypeInfoMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetTypeToTypeInfoMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetWithActionStatusToProxyTargetMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetWithActionStatusToProxyTargetMapper.java index ddab711ffe..8d6010b3f8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetWithActionStatusToProxyTargetMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TargetWithActionStatusToProxyTargetMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TypeToProxyTypeMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TypeToProxyTypeMapper.java index 8ac84ee941..e0edb2ae61 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TypeToProxyTypeMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TypeToProxyTypeMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TypeToTypeInfoMapper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TypeToTypeInfoMapper.java index 746b26bd27..1138e033c1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TypeToTypeInfoMapper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/mappers/TypeToTypeInfoMapper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.mappers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/AbstractGenericDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/AbstractGenericDataProvider.java index 319390e2cf..250a09b218 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/AbstractGenericDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/AbstractGenericDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/AbstractMetaDataDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/AbstractMetaDataDataProvider.java index 52741b86d2..f39cab65ac 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/AbstractMetaDataDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/AbstractMetaDataDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/AbstractProxyDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/AbstractProxyDataProvider.java index c5d4e3c969..19024f96fd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/AbstractProxyDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/AbstractProxyDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionDataProvider.java index 5ad3dc6b4e..206eadcf70 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionStatusDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionStatusDataProvider.java index a6da5894c2..af7d10cf3e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionStatusDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionStatusDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionStatusMsgDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionStatusMsgDataProvider.java index 8bf44d97fc..98bcf3faf5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionStatusMsgDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ActionStatusMsgDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ArtifactDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ArtifactDataProvider.java index 7f3d746931..b976eb6c73 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ArtifactDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/ArtifactDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetDistributionsStateDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetDistributionsStateDataProvider.java index e6713a8b21..bf3545df46 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetDistributionsStateDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetDistributionsStateDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetManagementStateDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetManagementStateDataProvider.java index 8a86503023..9658d633ab 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetManagementStateDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetManagementStateDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetStatelessDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetStatelessDataProvider.java index c5adc84a1f..49d34de6ab 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetStatelessDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetStatelessDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetTagDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetTagDataProvider.java index aab3309920..a5171f171c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetTagDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetTagDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetTypeDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetTypeDataProvider.java index 81e2f12cc3..52f583c7e4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetTypeDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DistributionSetTypeDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DsMetaDataDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DsMetaDataDataProvider.java index 7a54ac373e..5203040a75 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DsMetaDataDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/DsMetaDataDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/RolloutDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/RolloutDataProvider.java index d3a8e91568..e55798883c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/RolloutDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/RolloutDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/RolloutGroupDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/RolloutGroupDataProvider.java index 8e3c7164b3..d92126a5c8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/RolloutGroupDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/RolloutGroupDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/RolloutGroupTargetsDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/RolloutGroupTargetsDataProvider.java index ba680579eb..8095ce04b4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/RolloutGroupTargetsDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/RolloutGroupTargetsDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/SmMetaDataDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/SmMetaDataDataProvider.java index 1d2b2ca3c5..1d5c99a280 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/SmMetaDataDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/SmMetaDataDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/SoftwareModuleDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/SoftwareModuleDataProvider.java index d8efbe8e87..6cb6053c9a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/SoftwareModuleDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/SoftwareModuleDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/SoftwareModuleTypeDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/SoftwareModuleTypeDataProvider.java index c746b8b47f..5e2f4b6f57 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/SoftwareModuleTypeDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/SoftwareModuleTypeDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterQueryDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterQueryDataProvider.java index 4d2a9de1c7..1658f160ea 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterQueryDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterQueryDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterQueryDetailsDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterQueryDetailsDataProvider.java index 6c40e75d04..215d5e6c12 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterQueryDetailsDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterQueryDetailsDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterStateDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterStateDataProvider.java index 93c57524b2..d1a3dbeea8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterStateDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetFilterStateDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetManagementStateDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetManagementStateDataProvider.java index ba85b8604e..a0428ded63 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetManagementStateDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetManagementStateDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetMetaDataDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetMetaDataDataProvider.java index 13675e1d6b..dde495cce4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetMetaDataDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetMetaDataDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetTagDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetTagDataProvider.java index 7a157d9c9b..ca09c866c5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetTagDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetTagDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetTypeDataProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetTypeDataProvider.java index 95b57d7cd1..f8836f5245 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetTypeDataProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/providers/TargetTypeDataProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.providers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyAction.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyAction.java index ff7dee75b0..8a43bde847 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyAction.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyAction.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyActionStatus.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyActionStatus.java index 0b179872bf..0bc893028f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyActionStatus.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyActionStatus.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyAdvancedRolloutGroup.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyAdvancedRolloutGroup.java index 9776ae0468..4ae558214c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyAdvancedRolloutGroup.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyAdvancedRolloutGroup.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyArtifact.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyArtifact.java index 6ffb3c3fd1..d52da7b3dd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyArtifact.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyArtifact.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyAssignmentWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyAssignmentWindow.java index 68b857df21..b6e4528615 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyAssignmentWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyAssignmentWindow.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyBulkUploadWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyBulkUploadWindow.java index d9584738e8..4315f62534 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyBulkUploadWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyBulkUploadWindow.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyDistributionSet.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyDistributionSet.java index fa9dd4e4d8..db41e3a352 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyDistributionSet.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyDistributionSet.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyDistributionSetInfo.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyDistributionSetInfo.java index 9a926239ef..56863d3b4e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyDistributionSetInfo.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyDistributionSetInfo.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyFilterButton.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyFilterButton.java index 9f1406ff26..c49a869b72 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyFilterButton.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyFilterButton.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyIdentifiableEntity.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyIdentifiableEntity.java index 51946d0076..ded0d081c4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyIdentifiableEntity.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyIdentifiableEntity.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyKeyValueDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyKeyValueDetails.java index cd746b4ed0..13b5919966 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyKeyValueDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyKeyValueDetails.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyLoginCredentials.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyLoginCredentials.java index 905fec4c7a..1c7a6d71c1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyLoginCredentials.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyLoginCredentials.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyMessage.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyMessage.java index e20c511840..2e17c75f39 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyMessage.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyMessage.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyMetaData.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyMetaData.java index 130c45cfae..0be528375b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyMetaData.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyMetaData.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyNamedEntity.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyNamedEntity.java index bc90a0d769..cc5ffc5bd3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyNamedEntity.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyNamedEntity.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRollout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRollout.java index 9bd4b0348d..da73b7640a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRollout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRollout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutApproval.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutApproval.java index 9247fe9d32..5b964dfca1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutApproval.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutApproval.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutForm.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutForm.java index 9bf109178d..96df0fd132 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutForm.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutForm.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutGroup.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutGroup.java index 31fcaef4d3..988a810ba8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutGroup.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutGroup.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutWindow.java index 984dd63ec6..be15f1c087 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyRolloutWindow.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySimpleRolloutGroupsDefinition.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySimpleRolloutGroupsDefinition.java index 66adda9836..dd00aeb817 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySimpleRolloutGroupsDefinition.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySimpleRolloutGroupsDefinition.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySoftwareModule.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySoftwareModule.java index af42dc1c81..e2078a62d6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySoftwareModule.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySoftwareModule.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySoftwareModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySoftwareModuleDetails.java index e192e8f860..b3f91c621b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySoftwareModuleDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySoftwareModuleDetails.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigAuthentication.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigAuthentication.java index c066d225b0..80063cda46 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigAuthentication.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigAuthentication.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigDsType.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigDsType.java index 484c878513..9402801527 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigDsType.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigDsType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigPolling.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigPolling.java index 03571d56d6..3593974d85 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigPolling.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigPolling.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigRepository.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigRepository.java index fb52252a00..aa2d64c694 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigRepository.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigRepository.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigRollout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigRollout.java index af86ae0780..3163224a88 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigRollout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigRollout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigWindow.java index 598dec7dcb..d7dbdeea58 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigWindow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxySystemConfigWindow.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; @@ -22,7 +23,6 @@ public class ProxySystemConfigWindow implements Serializable { private String description; private boolean attributeSearchEnabled; - /** * Gets the id * @@ -80,6 +80,7 @@ public void setDescription(final String description) { this.description = description; } + public boolean isAttributeSearchEnabled() { return this.attributeSearchEnabled; } @@ -87,5 +88,4 @@ public boolean isAttributeSearchEnabled() { public void setAttributeSearch(final boolean enabled){ this.attributeSearchEnabled = enabled; } - } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTag.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTag.java index d0fe2f1429..47330bebe7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTag.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTag.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTarget.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTarget.java index d6dc240059..2dc9b01287 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTarget.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTarget.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetAttributesDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetAttributesDetails.java index 63aecff3ba..f9a23cb719 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetAttributesDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetAttributesDetails.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetConfirmationOptions.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetConfirmationOptions.java index df6899b8ac..b5d1e146f0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetConfirmationOptions.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetConfirmationOptions.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetFilterQuery.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetFilterQuery.java index 05d6a34aef..3cc95b43f8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetFilterQuery.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetFilterQuery.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetFilterQueryInfo.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetFilterQueryInfo.java index 17dbf1dc75..77cc576581 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetFilterQueryInfo.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetFilterQueryInfo.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetType.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetType.java index 48c1106664..a9dd7cd026 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetType.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTargetType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyType.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyType.java index 0e724b6940..5b31c920ee 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyType.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTypeInfo.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTypeInfo.java index f14ce34c83..7ef54a6564 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTypeInfo.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyTypeInfo.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyUploadProgress.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyUploadProgress.java index 3ec7e5f26d..b380b1b2a0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyUploadProgress.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/proxies/ProxyUploadProgress.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.proxies; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/DataSupplier.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/DataSupplier.java index 2cb04254ca..c25c7879f1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/DataSupplier.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/DataSupplier.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.suppliers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetFilterStateDataSupplier.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetFilterStateDataSupplier.java index 9918923cf1..df6aaecf11 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetFilterStateDataSupplier.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetFilterStateDataSupplier.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.suppliers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetFilterStateDataSupplierImpl.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetFilterStateDataSupplierImpl.java index 5098699692..4d9622eedb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetFilterStateDataSupplierImpl.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetFilterStateDataSupplierImpl.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.suppliers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetManagementStateDataSupplier.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetManagementStateDataSupplier.java index 44eec07078..31c66765c1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetManagementStateDataSupplier.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetManagementStateDataSupplier.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.suppliers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetManagementStateDataSupplierImpl.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetManagementStateDataSupplierImpl.java index e1735e219a..d89e4b5332 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetManagementStateDataSupplierImpl.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/data/suppliers/TargetManagementStateDataSupplierImpl.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.data.suppliers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractGridDetailsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractGridDetailsLayout.java index ff7a5744ff..75f980f7a2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractGridDetailsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractGridDetailsLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractMetaDataWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractMetaDataWindowBuilder.java index c45c09c828..1910fc59e9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractMetaDataWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractMetaDataWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractMetaDataWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractMetaDataWindowLayout.java index a49d9c8942..89acc13377 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractMetaDataWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AbstractMetaDataWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AddMetaDataWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AddMetaDataWindowController.java index f5d9926945..073e62f2bc 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AddMetaDataWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/AddMetaDataWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/ArtifactDetailsHeaderSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/ArtifactDetailsHeaderSupport.java index 8221a27064..ac15b6fd4e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/ArtifactDetailsHeaderSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/ArtifactDetailsHeaderSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/EditDetailsHeaderSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/EditDetailsHeaderSupport.java index 9ad63dd7db..040b6366ea 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/EditDetailsHeaderSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/EditDetailsHeaderSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/KeyValueDetailsComponent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/KeyValueDetailsComponent.java index 226effc034..3aefe4f0de 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/KeyValueDetailsComponent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/KeyValueDetailsComponent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataAddUpdateWindowLayout.java index dcc4ab1cdd..b148e78250 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataAddUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataAddUpdateWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataAddUpdateWindowLayoutComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataAddUpdateWindowLayoutComponentBuilder.java index 5d0678604b..ce82da2c30 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataAddUpdateWindowLayoutComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataAddUpdateWindowLayoutComponentBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataDetailsHeaderSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataDetailsHeaderSupport.java index 5be5d6cbbe..c0b00d1f94 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataDetailsHeaderSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataDetailsHeaderSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataWindowGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataWindowGrid.java index 4d3d622011..a9dc15820a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataWindowGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetaDataWindowGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetadataDetailsGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetadataDetailsGrid.java index 41eaa7385e..16c589a922 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetadataDetailsGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetadataDetailsGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetadataWindowGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetadataWindowGridHeader.java index bc1e894fc4..3549be099e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetadataWindowGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/MetadataWindowGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/ProxyMetadataValidator.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/ProxyMetadataValidator.java index 77e9741516..d3e0f9aa2a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/ProxyMetadataValidator.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/ProxyMetadataValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetails.java index 8cf08fc59d..bb12694353 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetails.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetailsGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetailsGrid.java index cb633cf491..d1a8b0758a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetailsGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetailsGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetailsHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetailsHeader.java index f3fef3bd2a..f6e29ee918 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetailsHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/SoftwareModuleDetailsHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/TargetFilterQueryDetailsGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/TargetFilterQueryDetailsGrid.java index 9bbb0247c8..961b10602c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/TargetFilterQueryDetailsGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/TargetFilterQueryDetailsGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/UpdateMetaDataWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/UpdateMetaDataWindowController.java index ae269b7276..382b0965d6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/UpdateMetaDataWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/detailslayout/UpdateMetaDataWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.detailslayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/AbstractDistributionSetGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/AbstractDistributionSetGridLayout.java index 91475b8d20..872a30a95f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/AbstractDistributionSetGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/AbstractDistributionSetGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.distributionset; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/AbstractDsGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/AbstractDsGrid.java index e59d5670e7..86779712e5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/AbstractDsGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/AbstractDsGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.distributionset; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DistributionSetDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DistributionSetDetails.java index 9cb1045300..8de44beb67 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DistributionSetDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DistributionSetDetails.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.distributionset; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DistributionSetDetailsHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DistributionSetDetailsHeader.java index 179a73a748..d8d0e55667 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DistributionSetDetailsHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DistributionSetDetailsHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.distributionset; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DistributionSetGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DistributionSetGridHeader.java index ff5ce3192a..efd43c371c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DistributionSetGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DistributionSetGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.distributionset; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DsMetaDataWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DsMetaDataWindowBuilder.java index d2f32cd5f0..7ab40bdfc6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DsMetaDataWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DsMetaDataWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.distributionset; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DsWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DsWindowBuilder.java index 96d81491e7..550ee856a9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DsWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/distributionset/DsWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.distributionset; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/ActionsVisibilityEventPayload.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/ActionsVisibilityEventPayload.java index af5966a098..07282113a0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/ActionsVisibilityEventPayload.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/ActionsVisibilityEventPayload.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/BulkUploadEventPayload.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/BulkUploadEventPayload.java index 7e135fc7f4..c4b8f79a12 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/BulkUploadEventPayload.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/BulkUploadEventPayload.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/CommandTopics.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/CommandTopics.java index 95dd813c1e..6c42281575 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/CommandTopics.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/CommandTopics.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EntityDraggingEventPayload.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EntityDraggingEventPayload.java index 2223f1218e..db6b344fa3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EntityDraggingEventPayload.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EntityDraggingEventPayload.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EntityModifiedEventPayload.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EntityModifiedEventPayload.java index 42c5225dc8..0e6fdf573f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EntityModifiedEventPayload.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EntityModifiedEventPayload.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EntityModifiedEventPayloadIdentifier.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EntityModifiedEventPayloadIdentifier.java index 1f4bb49d14..9e417b1e0f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EntityModifiedEventPayloadIdentifier.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EntityModifiedEventPayloadIdentifier.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventLayout.java index 2a2842c996..af068caef7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventLayoutViewAware.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventLayoutViewAware.java index f2570076d8..d5d48770f0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventLayoutViewAware.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventLayoutViewAware.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventNotificationType.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventNotificationType.java index 13d438f564..8c640d66ac 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventNotificationType.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventNotificationType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventTopics.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventTopics.java index 5e57e48197..56169a69a4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventTopics.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventTopics.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventView.java index a0ad7ad38a..0e177ec4a9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventViewAware.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventViewAware.java index 815601ed7b..556712d6f0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventViewAware.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/EventViewAware.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/FilterChangedEventPayload.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/FilterChangedEventPayload.java index 545556c0ab..1cbc81ac9d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/FilterChangedEventPayload.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/FilterChangedEventPayload.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/FilterType.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/FilterType.java index b075dc4f4b..194d8205f0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/FilterType.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/FilterType.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/LayoutResizeEventPayload.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/LayoutResizeEventPayload.java index 3baa51bc13..3b8cbf1ab1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/LayoutResizeEventPayload.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/LayoutResizeEventPayload.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/LayoutVisibilityEventPayload.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/LayoutVisibilityEventPayload.java index bb36dcf11d..aaeb8336c9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/LayoutVisibilityEventPayload.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/LayoutVisibilityEventPayload.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/PinningChangedEventPayload.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/PinningChangedEventPayload.java index a19b419922..e9d36e5efd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/PinningChangedEventPayload.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/PinningChangedEventPayload.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/SelectionChangedEventPayload.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/SelectionChangedEventPayload.java index 4b0e297a67..5b7b09e9dd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/SelectionChangedEventPayload.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/SelectionChangedEventPayload.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/ShowFormEventPayload.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/ShowFormEventPayload.java index 284483ea68..1708f08c48 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/ShowFormEventPayload.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/ShowFormEventPayload.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/TargetFilterTabChangedEventPayload.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/TargetFilterTabChangedEventPayload.java index a3b6756eb5..2267145214 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/TargetFilterTabChangedEventPayload.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/TargetFilterTabChangedEventPayload.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/TenantConfigChangedEventPayload.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/TenantConfigChangedEventPayload.java index 4cb0765deb..81e55371aa 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/TenantConfigChangedEventPayload.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/event/TenantConfigChangedEventPayload.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtonClickBehaviour.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtonClickBehaviour.java index 7739e42dbd..d429cd6fe6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtonClickBehaviour.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtonClickBehaviour.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.filterlayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java index 9a1d21eec3..fc2f232b83 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterButtons.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.filterlayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterLayout.java index ae99a11474..12b782f577 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.filterlayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterMultiButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterMultiButtonClick.java index ec57fc7d93..1503d6bf01 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterMultiButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterMultiButtonClick.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.filterlayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterSingleButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterSingleButtonClick.java index 8866269a99..12f387af21 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterSingleButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractFilterSingleButtonClick.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.filterlayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractTagFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractTagFilterButtons.java index 594814bf77..3f6f72f850 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractTagFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractTagFilterButtons.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.filterlayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractTargetTypeFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractTargetTypeFilterButtons.java index 436b4f7357..1c99c3092f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractTargetTypeFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractTargetTypeFilterButtons.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.filterlayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractTypeFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractTypeFilterButtons.java index 5704895495..dccb80f791 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractTypeFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/AbstractTypeFilterButtons.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.filterlayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/TagFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/TagFilterButtonClick.java index 2b19ed629a..551539a117 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/TagFilterButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/TagFilterButtonClick.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.filterlayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/TargetTypeFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/TargetTypeFilterButtonClick.java index be009b5846..dd8c99ec64 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/TargetTypeFilterButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/TargetTypeFilterButtonClick.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.filterlayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/TypeFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/TypeFilterButtonClick.java index 01551c72a7..c8b6cfb12f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/TypeFilterButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/filterlayout/TypeFilterButtonClick.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.filterlayout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGrid.java index 53b3d6feab..32484fb49c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/AbstractGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractBreadcrumbGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractBreadcrumbGridHeader.java index c36b11004a..8876e77349 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractBreadcrumbGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractBreadcrumbGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractDetailsHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractDetailsHeader.java index 017b242069..bf9ca733e1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractDetailsHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractDetailsHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractEntityGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractEntityGridHeader.java index 829d13be60..ebe979287d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractEntityGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractEntityGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractFilterHeader.java index fa27b5b3bf..09c78c6064 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractFilterHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractGridHeader.java index 1c68ce49c4..933bcdb5f7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractMasterAwareGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractMasterAwareGridHeader.java index 87d493f3d5..8bbf472c4b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractMasterAwareGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/AbstractMasterAwareGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/AddHeaderSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/AddHeaderSupport.java index 390062f7ab..cbf4fa2061 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/AddHeaderSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/AddHeaderSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/BulkUploadHeaderSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/BulkUploadHeaderSupport.java index f995962fc7..ca2c676583 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/BulkUploadHeaderSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/BulkUploadHeaderSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/CloseHeaderSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/CloseHeaderSupport.java index 87912d17f8..a77cbf3eac 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/CloseHeaderSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/CloseHeaderSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/CrudMenuHeaderSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/CrudMenuHeaderSupport.java index 1aab97a327..2307823015 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/CrudMenuHeaderSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/CrudMenuHeaderSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/DistributionSetFilterDropAreaSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/DistributionSetFilterDropAreaSupport.java index 6921d7e8cf..b5cc0365d4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/DistributionSetFilterDropAreaSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/DistributionSetFilterDropAreaSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/FilterButtonsHeaderSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/FilterButtonsHeaderSupport.java index f59e6a7832..795c49f172 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/FilterButtonsHeaderSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/FilterButtonsHeaderSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/HeaderSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/HeaderSupport.java index 321a28ce37..fc6c83301b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/HeaderSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/HeaderSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/ResizeHeaderSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/ResizeHeaderSupport.java index 2df994b4c6..628b04d1fc 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/ResizeHeaderSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/ResizeHeaderSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/SearchHeaderSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/SearchHeaderSupport.java index 622bdbe15b..8a680492c1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/SearchHeaderSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/header/support/SearchHeaderSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.header.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionGridDragSource.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionGridDragSource.java index 8aa9e082fb..ac61b9f716 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionGridDragSource.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionGridDragSource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.selection; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionGridRowDragger.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionGridRowDragger.java index f85697b995..822aa3132a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionGridRowDragger.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionGridRowDragger.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.selection; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionModel.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionModel.java index 0b93286258..477091a80b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionModel.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionModel.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.selection; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionWidgetset.gwt.xml b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionWidgetset.gwt.xml index 6ea1e27863..30f62297d4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionWidgetset.gwt.xml +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/RangeSelectionWidgetset.gwt.xml @@ -1,12 +1,13 @@ diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeDragSourceConnector.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeDragSourceConnector.java index e5ee0fa6f7..282a0e22f7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeDragSourceConnector.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeDragSourceConnector.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.selection.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeDragSourceSelectionState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeDragSourceSelectionState.java index a6bbd9fc2f..39d5a6d11e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeDragSourceSelectionState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeDragSourceSelectionState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.selection.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionHandler.java index 7c91c08c1c..f231edd6c2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionHandler.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.selection.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionModelConnector.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionModelConnector.java index 85d2de20ee..4e60d389d2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionModelConnector.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionModelConnector.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.selection.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionServerRpc.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionServerRpc.java index 0c94289193..98042b2b47 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionServerRpc.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionServerRpc.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.selection.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionState.java index ef82881254..273dc262cc 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/selection/client/RangeSelectionState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.selection.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/DeleteSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/DeleteSupport.java index b1e9b4cb2c..8336147f5a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/DeleteSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/DeleteSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/DragAndDropSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/DragAndDropSupport.java index 2b444f4876..a9f18fdf7f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/DragAndDropSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/DragAndDropSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/FilterSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/FilterSupport.java index 7924021e22..3e6c77b3b0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/FilterSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/FilterSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/MasterEntitySupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/MasterEntitySupport.java index e7ff1dd2b2..3c3aaff72a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/MasterEntitySupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/MasterEntitySupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/PinSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/PinSupport.java index 28b0a521f4..7e1f0ce4c5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/PinSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/PinSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/SelectionSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/SelectionSupport.java index 310f9705f7..2742590e8c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/SelectionSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/SelectionSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/AbstractTargetsToTargetTypeAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/AbstractTargetsToTargetTypeAssignmentSupport.java index 8cb6f8c90c..e4298d8b21 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/AbstractTargetsToTargetTypeAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/AbstractTargetsToTargetTypeAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/AssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/AssignmentSupport.java index 99a522abd9..f67adc7bda 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/AssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/AssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DeploymentAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DeploymentAssignmentSupport.java index be0355b5bb..fbf1037889 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DeploymentAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DeploymentAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DistributionSetsToTagAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DistributionSetsToTagAssignmentSupport.java index 51b24ac5fc..f576036fe1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DistributionSetsToTagAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DistributionSetsToTagAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DistributionSetsToTargetAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DistributionSetsToTargetAssignmentSupport.java index 9e6b24aaf7..57994a8cc5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DistributionSetsToTargetAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DistributionSetsToTargetAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DsTagsToDistributionSetAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DsTagsToDistributionSetAssignmentSupport.java index 18c5d11ba2..703c88352f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DsTagsToDistributionSetAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/DsTagsToDistributionSetAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/SwModulesToDistributionSetAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/SwModulesToDistributionSetAssignmentSupport.java index 0d1601574d..721d4dc189 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/SwModulesToDistributionSetAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/SwModulesToDistributionSetAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TagsAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TagsAssignmentSupport.java index 0c5e0ae7f7..40963d4119 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TagsAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TagsAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetTagsToDistributionSetAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetTagsToDistributionSetAssignmentSupport.java index 0c9f6d5491..4ffa43aed8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetTagsToDistributionSetAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetTagsToDistributionSetAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetTagsToTargetAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetTagsToTargetAssignmentSupport.java index ec8e6e8bad..d0bded094d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetTagsToTargetAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetTagsToTargetAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToDistributionSetAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToDistributionSetAssignmentSupport.java index 457a32bec3..6bf7dbfab2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToDistributionSetAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToDistributionSetAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToNoTargetTypeAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToNoTargetTypeAssignmentSupport.java index eee84202d2..9bc1597398 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToNoTargetTypeAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToNoTargetTypeAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToTagAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToTagAssignmentSupport.java index 382a303ed9..0761d62a5d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToTagAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToTagAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToTargetTypeAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToTargetTypeAssignmentSupport.java index 73e49f6f49..5214f7df75 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToTargetTypeAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TargetsToTargetTypeAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/ToTagAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/ToTagAssignmentSupport.java index 3c154d318b..69e9071761 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/ToTagAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/ToTagAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TypeToTargetAssignmentSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TypeToTargetAssignmentSupport.java index 995468a3d3..494c29d093 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TypeToTargetAssignmentSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/grid/support/assignment/TypeToTargetAssignmentSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.grid.support.assignment; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/AbstractFooterSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/AbstractFooterSupport.java index 937dfcc8f2..a53bd2834b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/AbstractFooterSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/AbstractFooterSupport.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/AbstractGridComponentLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/AbstractGridComponentLayout.java index 7c5e4a33bc..eb58e6eed8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/AbstractGridComponentLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/AbstractGridComponentLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/CountAwareComponent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/CountAwareComponent.java index f833cb69a9..b6546e528c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/CountAwareComponent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/CountAwareComponent.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2021 Bosch.IO GmbH and others. +/** + * Copyright (c) 2021 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/MasterEntityAwareComponent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/MasterEntityAwareComponent.java index 1a982d6ad5..548c9be320 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/MasterEntityAwareComponent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/MasterEntityAwareComponent.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/BulkUploadChangedListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/BulkUploadChangedListener.java index 3c77b6ac27..6613c5a61d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/BulkUploadChangedListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/BulkUploadChangedListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/EntityDraggingListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/EntityDraggingListener.java index 520d8a3ef9..f1ddca2dc6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/EntityDraggingListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/EntityDraggingListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/EntityModifiedListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/EntityModifiedListener.java index 7c22504a6d..f8f99f4d80 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/EntityModifiedListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/EntityModifiedListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/FilterChangedListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/FilterChangedListener.java index 976313ac66..8a08b56126 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/FilterChangedListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/FilterChangedListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/GenericEventListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/GenericEventListener.java index ece995e3b9..f639e93d7c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/GenericEventListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/GenericEventListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/GridActionsVisibilityListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/GridActionsVisibilityListener.java index 062ea346d1..4fb5468c85 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/GridActionsVisibilityListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/GridActionsVisibilityListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/LayoutResizeListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/LayoutResizeListener.java index 57b6b1a860..60c0d70b41 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/LayoutResizeListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/LayoutResizeListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/LayoutViewAwareListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/LayoutViewAwareListener.java index 6ea39ccbd6..692161d4fb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/LayoutViewAwareListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/LayoutViewAwareListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/LayoutVisibilityListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/LayoutVisibilityListener.java index 85ccb2dd95..91c4f1acdb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/LayoutVisibilityListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/LayoutVisibilityListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/PinningChangedListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/PinningChangedListener.java index 200810963b..b83a2ef1bf 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/PinningChangedListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/PinningChangedListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/SelectGridEntityListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/SelectGridEntityListener.java index b0b5fdfe58..9e384ff4f8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/SelectGridEntityListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/SelectGridEntityListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/SelectionChangedListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/SelectionChangedListener.java index 27b4fc8012..7fe8227332 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/SelectionChangedListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/SelectionChangedListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/ShowEntityFormLayoutListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/ShowEntityFormLayoutListener.java index ba4edb6f43..b254d3db86 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/ShowEntityFormLayoutListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/ShowEntityFormLayoutListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/TenantConfigChangedListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/TenantConfigChangedListener.java index a0a0e8a8fa..3279c00b9c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/TenantConfigChangedListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/TenantConfigChangedListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2022 Bosch.IO GmbH and others. +/** + * Copyright (c) 2022 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/TopicEventListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/TopicEventListener.java index 919f477c07..6aac9293bc 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/TopicEventListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/TopicEventListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/ViewAwareListener.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/ViewAwareListener.java index 6b5b2b225d..8331a25c4c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/ViewAwareListener.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/ViewAwareListener.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedCountAwareSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedCountAwareSupport.java index c8be902846..c17f3d1107 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedCountAwareSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedCountAwareSupport.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2021 Bosch.IO GmbH and others. +/** + * Copyright (c) 2021 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedGenericSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedGenericSupport.java index dfc2591222..518a1450ce 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedGenericSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedGenericSupport.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedGridRefreshAwareSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedGridRefreshAwareSupport.java index d0a65b65ec..87f2579e24 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedGridRefreshAwareSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedGridRefreshAwareSupport.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedPinAwareSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedPinAwareSupport.java index 861907279d..6bd800a3b1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedPinAwareSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedPinAwareSupport.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedSelectionAwareSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedSelectionAwareSupport.java index a947e98413..bab4199254 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedSelectionAwareSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedSelectionAwareSupport.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedTagTokenAwareSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedTagTokenAwareSupport.java index 90ffc40ecb..972a569962 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedTagTokenAwareSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/layout/listener/support/EntityModifiedTagTokenAwareSupport.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.layout.listener.support; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/notification/ParallelNotification.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/notification/ParallelNotification.java index 724007465a..cc2edfcc12 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/notification/ParallelNotification.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/notification/ParallelNotification.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.notification; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/notification/ParallelNotificationWidgetset.gwt.xml b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/notification/ParallelNotificationWidgetset.gwt.xml index 41c93da564..fdf18ab4bb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/notification/ParallelNotificationWidgetset.gwt.xml +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/notification/ParallelNotificationWidgetset.gwt.xml @@ -1,12 +1,13 @@ diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/notification/client/ParallelNotificationConnector.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/notification/client/ParallelNotificationConnector.java index ef2e26c1e4..19f56e6b65 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/notification/client/ParallelNotificationConnector.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/notification/client/ParallelNotificationConnector.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.notification.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/softwaremodule/AbstractSoftwareModuleGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/softwaremodule/AbstractSoftwareModuleGridLayout.java index 965690508f..ac62db7658 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/softwaremodule/AbstractSoftwareModuleGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/softwaremodule/AbstractSoftwareModuleGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.softwaremodule; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/GridLayoutUiState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/GridLayoutUiState.java index 677e89aa84..dfd06001f2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/GridLayoutUiState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/GridLayoutUiState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.state; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/HidableLayoutUiState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/HidableLayoutUiState.java index 22e8da8cbf..0d721a8d82 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/HidableLayoutUiState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/HidableLayoutUiState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.state; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/TagFilterLayoutUiState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/TagFilterLayoutUiState.java index 9ecba6f92f..288acaca5b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/TagFilterLayoutUiState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/TagFilterLayoutUiState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.state; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/TypeFilterLayoutUiState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/TypeFilterLayoutUiState.java index 71d3117a95..b617844972 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/TypeFilterLayoutUiState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/state/TypeFilterLayoutUiState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.state; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tag/ProxyTagValidator.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tag/ProxyTagValidator.java index 2a61c73341..5229b44844 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tag/ProxyTagValidator.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tag/ProxyTagValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.tag; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java index 989bd0e5c3..19674813a8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.tagdetails; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java index baa36ceb0f..578bad0a73 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/DistributionTagToken.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.tagdetails; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TagAssignementComboBox.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TagAssignementComboBox.java index 35f41c8872..709d544986 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TagAssignementComboBox.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TagAssignementComboBox.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.tagdetails; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TagListField.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TagListField.java index ae0de6ca71..277f01b614 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TagListField.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TagListField.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.tagdetails; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TagPanelLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TagPanelLayout.java index ece58b1a63..27bfdbaa24 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TagPanelLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TagPanelLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.tagdetails; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java index d21b3d41a7..457f8dc080 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/TargetTagToken.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.tagdetails; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/targettype/ProxyTargetTypeValidator.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/targettype/ProxyTargetTypeValidator.java index 8fa5ffea05..d6dd7332cd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/targettype/ProxyTargetTypeValidator.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/targettype/ProxyTargetTypeValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.targettype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/type/ProxyTypeValidator.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/type/ProxyTypeValidator.java index 02fe553d3a..d2cdcf42f7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/type/ProxyTypeValidator.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/type/ProxyTypeValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.common.type; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/ColorPickerComponent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/ColorPickerComponent.java index de834fb828..7e943b766d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/ColorPickerComponent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/ColorPickerComponent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.components; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/NotificationUnreadButton.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/NotificationUnreadButton.java index 47e3600dfe..98664e3395 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/NotificationUnreadButton.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/NotificationUnreadButton.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.components; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIButton.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIButton.java index 291c2c4005..5449a51834 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIButton.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIButton.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.components; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java index d34e40ec8e..3f1b861f02 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/components/SPUIComponentProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.components; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonDecorator.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonDecorator.java index 234204caee..d93f267965 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonDecorator.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonDecorator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.decorators; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorder.java index d5e1ffa2b6..938a87a4de 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.decorators; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorderWithIcon.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorderWithIcon.java index 027b724e3c..80ac1b47a3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorderWithIcon.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleNoBorderWithIcon.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.decorators; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleSmall.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleSmall.java index 6c95f1a2a1..d8ce434a72 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleSmall.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleSmall.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.decorators; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleTiny.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleTiny.java index eaa3199293..330e21087c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleTiny.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUIButtonStyleTiny.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.decorators; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUITagButtonStyle.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUITagButtonStyle.java index 91f8bd7e39..c0aa4b62a5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUITagButtonStyle.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/decorators/SPUITagButtonStyle.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.decorators; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsView.java index fb843e97e1..00c09f4da3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsViewMenuItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsViewMenuItem.java index a2de2b1b6b..b48071b775 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsViewMenuItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/DistributionsViewMenuItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/ManageDistUIState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/ManageDistUIState.java index 7e04ffe0f1..b639f255a9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/ManageDistUIState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/ManageDistUIState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/AddDsTypeWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/AddDsTypeWindowController.java index a9786e6890..3d62c76413 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/AddDsTypeWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/AddDsTypeWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.disttype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeSmSelectLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeSmSelectLayout.java index 72fa5b9ce1..d41a24cd0a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeSmSelectLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeSmSelectLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.disttype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeWindowBuilder.java index fe605f84a8..288f8ce83d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.disttype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeWindowLayout.java index 19e0bed331..6cf041758c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.disttype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeWindowLayoutComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeWindowLayoutComponentBuilder.java index e6ed9303af..6c68b5857f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeWindowLayoutComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/DsTypeWindowLayoutComponentBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.disttype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/SmTypeSelectedGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/SmTypeSelectedGrid.java index 5accbe6a33..8906b8ea79 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/SmTypeSelectedGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/SmTypeSelectedGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.disttype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/SmTypeSourceGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/SmTypeSourceGrid.java index 1a6fed37c0..4750f6fe6a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/SmTypeSourceGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/SmTypeSourceGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.disttype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/UpdateDsTypeWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/UpdateDsTypeWindowController.java index e234c6385c..04dee0f1d1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/UpdateDsTypeWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/UpdateDsTypeWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.disttype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/filter/DSTypeFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/filter/DSTypeFilterButtons.java index e6058454ba..37f5252e5a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/filter/DSTypeFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/filter/DSTypeFilterButtons.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.disttype.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/filter/DSTypeFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/filter/DSTypeFilterHeader.java index 4bd97eb480..c5e2240f4e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/filter/DSTypeFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/filter/DSTypeFilterHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.disttype.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/filter/DSTypeFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/filter/DSTypeFilterLayout.java index 337b929bfb..1b7c2a413a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/filter/DSTypeFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/filter/DSTypeFilterLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.disttype.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/AddDsWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/AddDsWindowController.java index aea4b78447..1727085a6a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/AddDsWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/AddDsWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.dstable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetGrid.java index 828ad558bf..08f5caf625 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.dstable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetGridLayout.java index a474e1c7b9..75616f5579 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DistributionSetGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.dstable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetaDataWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetaDataWindowLayout.java index b0ad9cde20..c8b5f0da23 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetaDataWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsMetaDataWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.dstable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsWindowLayout.java index f48fa43b0c..890d665b82 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.dstable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsWindowLayoutComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsWindowLayoutComponentBuilder.java index d8ca272676..997c830056 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsWindowLayoutComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/DsWindowLayoutComponentBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.dstable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/ProxyDsValidator.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/ProxyDsValidator.java index 55de4b298d..3b9ae1e100 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/ProxyDsValidator.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/ProxyDsValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.dstable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/UpdateDsWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/UpdateDsWindowController.java index 7af067edc3..d9ebeb4104 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/UpdateDsWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/dstable/UpdateDsWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.dstable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleGridLayout.java index 5905460d49..3fffdbd0b2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtable/SwModuleGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.smtable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/filter/DistSMTypeFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/filter/DistSMTypeFilterLayout.java index e366d5f8d6..66366d354e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/filter/DistSMTypeFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/filter/DistSMTypeFilterLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.smtype.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/filter/SmTypeCssStylesHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/filter/SmTypeCssStylesHandler.java index 4d227d9078..6fa732931e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/filter/SmTypeCssStylesHandler.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/smtype/filter/SmTypeCssStylesHandler.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.distributions.smtype.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/ErrorView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/ErrorView.java index ba38d92922..73f868e37c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/ErrorView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/ErrorView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/HawkbitUIErrorHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/HawkbitUIErrorHandler.java index 265f591a69..39e9b87609 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/HawkbitUIErrorHandler.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/HawkbitUIErrorHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/UiErrorDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/UiErrorDetails.java index 1f381fbc71..2db73f69c1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/UiErrorDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/UiErrorDetails.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/AbstractSingleUiErrorDetailsExtractor.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/AbstractSingleUiErrorDetailsExtractor.java index 8a418a9345..05d8558883 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/AbstractSingleUiErrorDetailsExtractor.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/AbstractSingleUiErrorDetailsExtractor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error.extractors; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/ArtifactEncryptionErrorExtractor.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/ArtifactEncryptionErrorExtractor.java index 09fd6e0350..68a6ac24db 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/ArtifactEncryptionErrorExtractor.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/ArtifactEncryptionErrorExtractor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error.extractors; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/AssignmentQuotaExceededErrorExtractor.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/AssignmentQuotaExceededErrorExtractor.java index 7e635dba29..5b02eadc48 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/AssignmentQuotaExceededErrorExtractor.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/AssignmentQuotaExceededErrorExtractor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error.extractors; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/ConstraintViolationErrorExtractor.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/ConstraintViolationErrorExtractor.java index 91196890c0..980adbc709 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/ConstraintViolationErrorExtractor.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/ConstraintViolationErrorExtractor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error.extractors; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/EntityNotFoundErrorExtractor.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/EntityNotFoundErrorExtractor.java index 36aea48fe3..67c2da6bc5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/EntityNotFoundErrorExtractor.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/EntityNotFoundErrorExtractor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error.extractors; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/IncompatibleTargetTypeErrorExtractor.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/IncompatibleTargetTypeErrorExtractor.java index 378e34b922..bc50c476af 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/IncompatibleTargetTypeErrorExtractor.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/IncompatibleTargetTypeErrorExtractor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error.extractors; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/InsufficientPermissionErrorExtractor.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/InsufficientPermissionErrorExtractor.java index 1094db665a..40231b9cd1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/InsufficientPermissionErrorExtractor.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/InsufficientPermissionErrorExtractor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error.extractors; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/InvalidDistributionSetErrorExtractor.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/InvalidDistributionSetErrorExtractor.java index 7684d7074d..3594fec18d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/InvalidDistributionSetErrorExtractor.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/InvalidDistributionSetErrorExtractor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error.extractors; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/UiErrorDetailsExtractor.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/UiErrorDetailsExtractor.java index e9edbae564..1fa076008b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/UiErrorDetailsExtractor.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/UiErrorDetailsExtractor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error.extractors; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/UploadErrorExtractor.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/UploadErrorExtractor.java index 16cb95884b..c57e806a6d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/UploadErrorExtractor.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/error/extractors/UploadErrorExtractor.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error.extractors; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AddTargetFilterController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AddTargetFilterController.java index ad863bcc2b..9af675f006 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AddTargetFilterController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AddTargetFilterController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowBuilder.java index 063db1de6a..ade7467443 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowController.java index 5e133cffca..1d5fd552fa 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowLayout.java index ff1c18cd4f..fc8054f6fe 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowLayoutComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowLayoutComponentBuilder.java index 041f3b01f6..30692c8e12 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowLayoutComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoAssignmentWindowLayoutComponentBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java index 7423005412..3d1be53b4e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/AutoCompleteTextFieldComponent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java index 3297d87cf8..dbcd6be64e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementViewMenuItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementViewMenuItem.java index a7f943b937..06be5396be 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementViewMenuItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/FilterManagementViewMenuItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/ProxyTargetFilterValidator.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/ProxyTargetFilterValidator.java index 5f1e04e3d3..ca99fd1006 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/ProxyTargetFilterValidator.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/ProxyTargetFilterValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterAddUpdateLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterAddUpdateLayout.java index e8a6d62407..b45ae6ca1d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterAddUpdateLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterAddUpdateLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterAddUpdateLayoutComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterAddUpdateLayoutComponentBuilder.java index 2aedffb217..200aa3ae79 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterAddUpdateLayoutComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterAddUpdateLayoutComponentBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterCountMessageLabel.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterCountMessageLabel.java index e5ddd10b76..362c642b95 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterCountMessageLabel.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterCountMessageLabel.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterDetailsGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterDetailsGridHeader.java index 5855a7a072..25352c6b67 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterDetailsGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterDetailsGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterDetailsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterDetailsLayout.java index 8428041604..45da2d8b03 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterDetailsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterDetailsLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterGrid.java index be4f8bc5e9..c9bcced190 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterGridHeader.java index c1134c050a..19919f288a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterGridLayout.java index 2ae6e3fa18..e38c26f0cb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTargetGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTargetGrid.java index 000ef71914..14d34086f6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTargetGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TargetFilterTargetGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; @@ -46,7 +47,8 @@ public class TargetFilterTargetGrid extends AbstractGrid { * @param uiState layout state */ public TargetFilterTargetGrid(final CommonUiDependencies uiDependencies, - TargetManagement targetManagement, final TargetFilterStateDataSupplier targetFilterStateDataSupplier, + TargetManagement targetManagement, + final TargetFilterStateDataSupplier targetFilterStateDataSupplier, final TargetFilterDetailsLayoutUiState uiState) { super(uiDependencies.getI18n(), uiDependencies.getEventBus(), null, targetFilterStateDataSupplier.dataCommunicator()); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TextFieldSuggestionBox.gwt.xml b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TextFieldSuggestionBox.gwt.xml index dda5fc3a60..8e82f57af8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TextFieldSuggestionBox.gwt.xml +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TextFieldSuggestionBox.gwt.xml @@ -1,12 +1,13 @@ diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TextFieldSuggestionBox.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TextFieldSuggestionBox.java index b630d5f79a..606ae9f3c4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TextFieldSuggestionBox.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/TextFieldSuggestionBox.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/UpdateTargetFilterController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/UpdateTargetFilterController.java index f33c986235..44a391b602 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/UpdateTargetFilterController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/UpdateTargetFilterController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/AutoCompleteTextFieldConnector.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/AutoCompleteTextFieldConnector.java index 3369a5ecc6..33f2e9bb08 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/AutoCompleteTextFieldConnector.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/AutoCompleteTextFieldConnector.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/SuggestTokenDto.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/SuggestTokenDto.java index b67f533ec5..02e9a2d4e5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/SuggestTokenDto.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/SuggestTokenDto.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/SuggestionContextDto.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/SuggestionContextDto.java index b4b1d03921..89c1611872 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/SuggestionContextDto.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/SuggestionContextDto.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/SuggestionsSelectList.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/SuggestionsSelectList.java index 446ffc1d02..0bd9211297 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/SuggestionsSelectList.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/SuggestionsSelectList.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/TextFieldSuggestionBoxClientRpc.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/TextFieldSuggestionBoxClientRpc.java index d4385db6f4..e538a97df7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/TextFieldSuggestionBoxClientRpc.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/TextFieldSuggestionBoxClientRpc.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/TextFieldSuggestionBoxServerRpc.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/TextFieldSuggestionBoxServerRpc.java index 4f29eb34c4..3b0aed6a87 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/TextFieldSuggestionBoxServerRpc.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/client/TextFieldSuggestionBoxServerRpc.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/state/FilterManagementUIState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/state/FilterManagementUIState.java index ad4a19c18f..eb093f99db 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/state/FilterManagementUIState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/state/FilterManagementUIState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement.state; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/state/TargetFilterDetailsLayoutUiState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/state/TargetFilterDetailsLayoutUiState.java index 00efcb4308..98e31fcb50 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/state/TargetFilterDetailsLayoutUiState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/state/TargetFilterDetailsLayoutUiState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement.state; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/state/TargetFilterGridLayoutUiState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/state/TargetFilterGridLayoutUiState.java index 4ca77ca3ab..764778a683 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/state/TargetFilterGridLayoutUiState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/state/TargetFilterGridLayoutUiState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.filtermanagement.state; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/login/AbstractHawkbitLoginUI.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/login/AbstractHawkbitLoginUI.java index 0269aadaf2..e3d232958d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/login/AbstractHawkbitLoginUI.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/login/AbstractHawkbitLoginUI.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.login; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java index 8337f6ab7d..73ccc17a8b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management; @@ -525,10 +526,11 @@ protected void subscribeListeners() { @Override protected void unsubscribeListeners() { if (permChecker.hasTargetReadPermission() || permChecker.hasReadRepositoryPermission()) { - layoutVisibilityListener.unsubscribe(); - layoutResizeListener.unsubscribe(); + layoutVisibilityListener.subscribe(); + layoutResizeListener.subscribe(); } - super.unsubscribeListeners(); + super.subscribeListeners(); } + } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentViewMenuItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentViewMenuItem.java index 1012c5f309..401046dddb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentViewMenuItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/DeploymentViewMenuItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/ManagementUIState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/ManagementUIState.java index a12e140438..5c44084a6c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/ManagementUIState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/ManagementUIState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGrid.java index d66e420e24..8914b7a7a1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.actionhistory; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGridHeader.java index 69de4b0e37..09cc91cc49 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.actionhistory; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGridLayout.java index 73d5d1f585..b9fc37f9bf 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.actionhistory; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGridLayoutUiState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGridLayoutUiState.java index 404e30e0d5..a528be2455 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGridLayoutUiState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryGridLayoutUiState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.actionhistory; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryLayout.java index 76dc25b866..0c86fe6410 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionHistoryLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.actionhistory; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusGrid.java index 2bdfccdc3b..9b538a7569 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.actionhistory; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusGridHeader.java index 76bfbe8a15..6020bac024 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.actionhistory; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusGridLayout.java index bedb7601ad..af577372dc 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.actionhistory; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusMsgGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusMsgGrid.java index c61959568d..463b3345ec 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusMsgGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusMsgGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.actionhistory; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusMsgGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusMsgGridHeader.java index 8bca0c4c56..3dcc5f7ee4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusMsgGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusMsgGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.actionhistory; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusMsgGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusMsgGridLayout.java index d02055023b..389fa2cf36 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusMsgGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/actionhistory/ActionStatusMsgGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.actionhistory; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/BulkUploadHandler.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/BulkUploadHandler.java index 9c0ff8171c..e7f9e26ee8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/BulkUploadHandler.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/BulkUploadHandler.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.bulkupload; @@ -109,7 +110,7 @@ public class BulkUploadHandler implements SucceededListener, FailedListener, Rec @Override public OutputStream receiveUpload(final String filename, final String mimeType) { try { - tempFile = File.createTempFile("temp", ".csv"); + tempFile = Files.createTempFile("temp", ".csv").toFile(); return new FileOutputStream(tempFile); } catch (final FileNotFoundException e) { diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/BulkUploadWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/BulkUploadWindowBuilder.java index 3d45decd47..e2cad0cfc1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/BulkUploadWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/BulkUploadWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.bulkupload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/BulkUploadWindowLayoutComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/BulkUploadWindowLayoutComponentBuilder.java index 76f6ceb401..7efb85a8ce 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/BulkUploadWindowLayoutComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/BulkUploadWindowLayoutComponentBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.bulkupload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkTokenTags.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkTokenTags.java index 97dc2fe5f0..28c0c7fac1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkTokenTags.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkTokenTags.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.bulkupload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkUpdateWindowLayout.java index a8e6936b80..9aee3c1c6c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkUpdateWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkUpdateWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.bulkupload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkUploadUiState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkUploadUiState.java index 002d54fd0e..80755c6b74 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkUploadUiState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/bulkupload/TargetBulkUploadUiState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.bulkupload; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionGrid.java index 4c3101a199..6f3734112c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.dstable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionGridLayout.java index 74598ec0d8..fa42df64a9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.dstable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionGridLayoutUiState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionGridLayoutUiState.java index 682e79bc18..dfd271ab51 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionGridLayoutUiState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionGridLayoutUiState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.dstable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/InvalidateDistributionSetSupport.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/InvalidateDistributionSetSupport.java index 37de27e6ca..7f41236c6d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/InvalidateDistributionSetSupport.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/InvalidateDistributionSetSupport.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.dstable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/InvalidateDsAffectedEntitiesDialog.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/InvalidateDsAffectedEntitiesDialog.java index 5c997ee33a..d065df46e5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/InvalidateDsAffectedEntitiesDialog.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/InvalidateDsAffectedEntitiesDialog.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.dstable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/InvalidateDsConsequencesDialog.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/InvalidateDsConsequencesDialog.java index fc5b13e573..d20a26c605 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/InvalidateDsConsequencesDialog.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/InvalidateDsConsequencesDialog.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.dstable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/AddDsTagWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/AddDsTagWindowController.java index 7f669d57c9..78dfc37724 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/AddDsTagWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/AddDsTagWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.dstag; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DsTagWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DsTagWindowBuilder.java index a0daccf573..e555ff22e2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DsTagWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/DsTagWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.dstag; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/UpdateDsTagWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/UpdateDsTagWindowController.java index c48b5d82c3..e8f3561f2e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/UpdateDsTagWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/UpdateDsTagWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.dstag; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/filter/DistributionTagButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/filter/DistributionTagButtons.java index 3b02d00e58..1c61b0832f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/filter/DistributionTagButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/filter/DistributionTagButtons.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.dstag.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/filter/DistributionTagFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/filter/DistributionTagFilterHeader.java index 75b7050067..45e7b2a9c1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/filter/DistributionTagFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/filter/DistributionTagFilterHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.dstag.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/filter/DistributionTagLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/filter/DistributionTagLayout.java index 4ee181e8eb..f2028f8bee 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/filter/DistributionTagLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstag/filter/DistributionTagLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.dstag.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/AbstractActionTypeOptionGroupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/AbstractActionTypeOptionGroupLayout.java index 2fb2b1bc89..174083131c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/AbstractActionTypeOptionGroupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/AbstractActionTypeOptionGroupLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.miscs; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/ActionTypeOptionGroupAssignmentLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/ActionTypeOptionGroupAssignmentLayout.java index ce13443b0a..917c3cb8e3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/ActionTypeOptionGroupAssignmentLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/ActionTypeOptionGroupAssignmentLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.miscs; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/ActionTypeOptionGroupAutoAssignmentLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/ActionTypeOptionGroupAutoAssignmentLayout.java index a22362a316..52a3de66f0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/ActionTypeOptionGroupAutoAssignmentLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/ActionTypeOptionGroupAutoAssignmentLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.miscs; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/AssignmentWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/AssignmentWindowLayout.java index d91d3ee8d2..0a9d8ca748 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/AssignmentWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/AssignmentWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.miscs; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/AssignmentWindowLayoutComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/AssignmentWindowLayoutComponentBuilder.java index 3f34b460bb..d404b83a67 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/AssignmentWindowLayoutComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/AssignmentWindowLayoutComponentBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.miscs; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/DeploymentAssignmentWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/DeploymentAssignmentWindowController.java index 04397e2c01..9acedd05a0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/DeploymentAssignmentWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/DeploymentAssignmentWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.miscs; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/MaintenanceWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/MaintenanceWindowLayout.java index aafa7f40f6..b234244f9c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/MaintenanceWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/miscs/MaintenanceWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) Siemens AG, 2018 + * Copyright (c) 2018 Siemens AG * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.miscs; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/tag/TagWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/tag/TagWindowLayout.java index 522225d851..475cbef6e8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/tag/TagWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/tag/TagWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.tag; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/tag/TagWindowLayoutComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/tag/TagWindowLayoutComponentBuilder.java index 8ea11577df..3cbfa6c34b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/tag/TagWindowLayoutComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/tag/TagWindowLayoutComponentBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.tag; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/AddTargetWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/AddTargetWindowController.java index d4af06ffcb..213daedccf 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/AddTargetWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/AddTargetWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/ProxyTargetValidator.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/ProxyTargetValidator.java index c53eab47fc..955bf83ad4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/ProxyTargetValidator.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/ProxyTargetValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAttributesDetailsComponent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAttributesDetailsComponent.java index 59f445aeee..49e7431314 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAttributesDetailsComponent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAttributesDetailsComponent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAutoConfActivationLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAutoConfActivationLayout.java index 687fb4e1d7..abe8b9c147 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAutoConfActivationLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAutoConfActivationLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAutoConfActivationWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAutoConfActivationWindowBuilder.java index fc8635e387..f1aaf41294 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAutoConfActivationWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAutoConfActivationWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetConfirmationOptionsComponent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetConfirmationOptionsComponent.java index b18bdb441b..22770584d8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetConfirmationOptionsComponent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetConfirmationOptionsComponent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetCountMessageLabel.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetCountMessageLabel.java index f812d571d2..c98cb4b89e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetCountMessageLabel.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetCountMessageLabel.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java index 17f940be94..753aac3dd6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetails.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetailsHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetailsHeader.java index ac125a6d82..e8630e6648 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetailsHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetDetailsHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGrid.java index e09b2460d1..e59a1f2971 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGridHeader.java index 149043a892..df0d349aad 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGridLayout.java index abc6e56d25..4c1c82ed23 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; @@ -297,6 +298,7 @@ public void unsubscribeListeners() { pinningChangedListener.unsubscribe(); targetChangedListener.unsubscribe(); selectTargetListener.unsubscribe(); + targetModifiedListener.unsubscribe(); tagModifiedListener.unsubscribe(); bulkUploadListener.unsubscribe(); } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGridLayoutUiState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGridLayoutUiState.java index 670e9cee7a..5632e7b009 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGridLayoutUiState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetGridLayoutUiState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetMetaDataWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetMetaDataWindowBuilder.java index fbd7e40f5d..85b4df546c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetMetaDataWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetMetaDataWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetMetaDataWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetMetaDataWindowLayout.java index 2d1928e0af..83a729bd19 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetMetaDataWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetMetaDataWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetWindowBuilder.java index fe50c07241..aa7ba59344 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetWindowLayout.java index 76d4747304..b222ecbb98 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetWindowLayoutComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetWindowLayoutComponentBuilder.java index cdf0d12060..f9bbdb0ed2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetWindowLayoutComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetWindowLayoutComponentBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/UpdateTargetWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/UpdateTargetWindowController.java index 7b7b8b11dc..84386d8fcf 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/UpdateTargetWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/UpdateTargetWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettable; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/AddTargetTagWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/AddTargetTagWindowController.java index 9b40d4e036..5fff20bede 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/AddTargetTagWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/AddTargetTagWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagWindowBuilder.java index d51062bba2..cdd5dc5fdd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/TargetTagWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/UpdateTargetTagWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/UpdateTargetTagWindowController.java index 6e2d22573c..6085a01d1a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/UpdateTargetTagWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/UpdateTargetTagWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/CustomTargetTagFilterButtonClick.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/CustomTargetTagFilterButtonClick.java index 360df17057..c7b08f8470 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/CustomTargetTagFilterButtonClick.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/CustomTargetTagFilterButtonClick.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/FilterByStatusLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/FilterByStatusLayout.java index f8e9d6b743..ac11b1e836 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/FilterByStatusLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/FilterByStatusLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/MultipleTargetFilter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/MultipleTargetFilter.java index c7a122cc4f..cb1f19a7dd 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/MultipleTargetFilter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/MultipleTargetFilter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.filter; @@ -218,6 +219,16 @@ public void selectedTabChanged() { filterByStatusFooter.clearStatusAndOverdueFilters(); targetTypeFilterButtons.clearAppliedTargetTypeFilter(); + targetTagFilterLayoutUiState.setTargetTypeFilterTabSelected(true); + targetTagFilterLayoutUiState.setCustomFilterTabSelected(false); + + eventBus.publish(EventTopics.TARGET_FILTER_TAB_CHANGED, this, TargetFilterTabChangedEventPayload.TARGET_TYPE); + } + if (UIComponentIdProvider.CUSTOM_FILTER_ACCORDION_TAB.equals(selectedTabId)){ + filterByButtons.clearTargetTagFilters(); + filterByStatusFooter.clearStatusAndOverdueFilters(); + targetTypeFilterButtons.clearAppliedTargetTypeFilter(); + targetTagFilterLayoutUiState.setCustomFilterTabSelected(true); targetTagFilterLayoutUiState.setTargetTypeFilterTabSelected(false); diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetFilterQueryButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetFilterQueryButtons.java index e1b158578a..92cbf7c56b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetFilterQueryButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetFilterQueryButtons.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterButtons.java index 0f52fb4f9d..0f24d9f8c5 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterButtons.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterHeader.java index 3005705174..8e27f90d06 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterLayout.java index c97656d36e..fb77f82a41 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterLayoutUiState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterLayoutUiState.java index 6e44f5021b..b6f5865f98 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterLayoutUiState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTagFilterLayoutUiState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTypeFilterButtons.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTypeFilterButtons.java index 4f84e57306..9184e8db88 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTypeFilterButtons.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/filter/TargetTypeFilterButtons.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.filter; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/AddTargetTypeWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/AddTargetTypeWindowController.java index 9922908d7f..b5d053aad0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/AddTargetTypeWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/AddTargetTypeWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.targettype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/DsTypeSelectedGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/DsTypeSelectedGrid.java index b579036bae..94ffe1b10d 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/DsTypeSelectedGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/DsTypeSelectedGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.targettype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/DsTypeSourceGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/DsTypeSourceGrid.java index 6a0fd9dad2..ceba7b0de1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/DsTypeSourceGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/DsTypeSourceGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.targettype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeDsTypeSelectLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeDsTypeSelectLayout.java index 85264a0cf1..b06d7d70cb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeDsTypeSelectLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeDsTypeSelectLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.targettype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeWindowBuilder.java index af5fa37742..645332610c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.targettype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeWindowLayout.java index 3210c59f90..f0653fe087 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.targettype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeWindowLayoutComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeWindowLayoutComponentBuilder.java index 99b810ccdf..543361f0b9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeWindowLayoutComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/TargetTypeWindowLayoutComponentBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.targettype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/UpdateTargetTypeWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/UpdateTargetTypeWindowController.java index 173e11fc71..f658f99098 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/UpdateTargetTypeWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettag/targettype/UpdateTargetTypeWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.management.targettag.targettype; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/AbstractDashboardMenuItemNotification.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/AbstractDashboardMenuItemNotification.java index 07603d6a77..333862a393 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/AbstractDashboardMenuItemNotification.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/AbstractDashboardMenuItemNotification.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.menu; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardEvent.java index e2bfe63fd6..e2baf3aeec 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.menu; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java index 284c10689d..f85b11f026 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenu.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.menu; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenuItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenuItem.java index 54e370bced..0c9bbd6757 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenuItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/DashboardMenuItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.menu; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/GravatarResource.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/GravatarResource.java index 20fd85808f..953c3c30af 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/GravatarResource.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/menu/GravatarResource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.menu; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/DelayedEventBusPushStrategy.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/DelayedEventBusPushStrategy.java index c4c68012e4..d23957b898 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/DelayedEventBusPushStrategy.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/DelayedEventBusPushStrategy.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.push; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/EventPushStrategy.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/EventPushStrategy.java index 504dece603..cad1e9a198 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/EventPushStrategy.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/EventPushStrategy.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.push; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/HawkbitEventPermissionChecker.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/HawkbitEventPermissionChecker.java index eb2eaf49a0..1d83d1c3af 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/HawkbitEventPermissionChecker.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/HawkbitEventPermissionChecker.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.push; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/HawkbitEventProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/HawkbitEventProvider.java index 1fe4bba9e9..54758b1ec4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/HawkbitEventProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/HawkbitEventProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.push; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/UIEventPermissionChecker.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/UIEventPermissionChecker.java index 452113bec4..57a9dd3c56 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/UIEventPermissionChecker.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/UIEventPermissionChecker.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.push; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/UIEventProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/UIEventProvider.java index 3d428798c5..8f8231a449 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/UIEventProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/UIEventProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.push; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/ActionChangedEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/ActionChangedEvent.java index 9b5f5c0eca..f7cff9caa4 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/ActionChangedEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/ActionChangedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.push.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/ParentIdAwareEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/ParentIdAwareEvent.java index 62a24beaea..a5e74ca6dc 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/ParentIdAwareEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/ParentIdAwareEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.push.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutChangedEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutChangedEvent.java index 11086fb2ed..9d04035a54 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutChangedEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutChangedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.push.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutGroupChangedEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutGroupChangedEvent.java index bcdaacfc71..5767318df7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutGroupChangedEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/push/event/RolloutGroupChangedEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.push.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/DistributionBarHelper.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/DistributionBarHelper.java index 43bae779a9..f26512c083 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/DistributionBarHelper.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/DistributionBarHelper.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/ProxyFontIcon.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/ProxyFontIcon.java index 34ecd2dbe2..e26b919c90 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/ProxyFontIcon.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/ProxyFontIcon.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutManagementUIState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutManagementUIState.java index 51833d2ed9..5d9292e66e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutManagementUIState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutManagementUIState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutView.java index 7cd0653747..6ea59b10c3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutViewMenuItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutViewMenuItem.java index 2484130f6e..d6bd424f93 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutViewMenuItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/RolloutViewMenuItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/event/RolloutEvent.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/event/RolloutEvent.java index 724187397d..c481412729 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/event/RolloutEvent.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/event/RolloutEvent.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.event; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/GroupsPieChart.gwt.xml b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/GroupsPieChart.gwt.xml index 038d9247f9..3fadf3da6e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/GroupsPieChart.gwt.xml +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/GroupsPieChart.gwt.xml @@ -1,12 +1,13 @@ diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/GroupsPieChart.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/GroupsPieChart.java index 586a9bc8cd..b1172d0553 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/GroupsPieChart.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/GroupsPieChart.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.groupschart; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/client/GroupsPieChartConnector.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/client/GroupsPieChartConnector.java index e691fc7e10..216dff0141 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/client/GroupsPieChartConnector.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/client/GroupsPieChartConnector.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.groupschart.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/client/GroupsPieChartState.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/client/GroupsPieChartState.java index 6295e5931c..03692bb388 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/client/GroupsPieChartState.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/client/GroupsPieChartState.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.groupschart.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/client/GroupsPieChartWidget.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/client/GroupsPieChartWidget.java index 6072b753b6..983607e9ce 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/client/GroupsPieChartWidget.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/groupschart/client/GroupsPieChartWidget.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.groupschart.client; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutGrid.java index 4256c272bb..bebb3904a1 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.rollout; @@ -223,6 +224,10 @@ private static boolean isCopyingAllowed(final RolloutStatus status) { return isDeletionAllowed(status) && status != RolloutStatus.CREATING; } + private static boolean isRolloutRetried(final String targetFilter) { + return targetFilter.contains("failedrollout"); + } + private static boolean isEditingAllowed(final RolloutStatus status) { final List statesThatAllowEditing = Arrays.asList(RolloutStatus.PAUSED, RolloutStatus.READY, RolloutStatus.RUNNING, RolloutStatus.STARTING, RolloutStatus.STOPPED); @@ -360,14 +365,16 @@ private void addActionColumns() { clickEvent -> updateRollout(rollout), VaadinIcons.EDIT, UIMessageIdProvider.TOOLTIP_ROLLOUT_UPDATE, SPUIStyleDefinitions.STATUS_ICON_NEUTRAL, UIComponentIdProvider.ROLLOUT_UPDATE_BUTTON_ID + "." + rollout.getId(), - permissionChecker.hasRolloutUpdatePermission() && isEditingAllowed(rollout.getStatus())); + permissionChecker.hasRolloutUpdatePermission() && isEditingAllowed(rollout.getStatus()) + && !isRolloutRetried(rollout.getTargetFilterQuery())); actionColumns.add(GridComponentBuilder.addIconColumn(this, updateButton, UPDATE_BUTTON_ID, null)); final ValueProvider copyButton = rollout -> GridComponentBuilder.buildActionButton(i18n, clickEvent -> copyRollout(rollout), VaadinIcons.COPY, UIMessageIdProvider.TOOLTIP_ROLLOUT_COPY, SPUIStyleDefinitions.STATUS_ICON_NEUTRAL, UIComponentIdProvider.ROLLOUT_COPY_BUTTON_ID + "." + rollout.getId(), - permissionChecker.hasRolloutCreatePermission() && isCopyingAllowed(rollout.getStatus())); + permissionChecker.hasRolloutCreatePermission() && isCopyingAllowed(rollout.getStatus()) + && !isRolloutRetried(rollout.getTargetFilterQuery())); actionColumns.add(GridComponentBuilder.addIconColumn(this, copyButton, COPY_BUTTON_ID, null)); actionColumns.add(GridComponentBuilder.addDeleteColumn(this, i18n, DELETE_BUTTON_ID, rolloutDeleteSupport, @@ -494,6 +501,23 @@ public void reselectCurrentRollout() { } } + private ConfirmationDialog createTriggerNextGroupDialog(final Long rolloutId) { + final String caption = i18n.getMessage("caption.rollout.confirm.trigger.next"); + final String question = i18n.getMessage("message.rollout.confirm.trigger.next"); + + return ConfirmationDialog.newBuilder(i18n, UIComponentIdProvider.ROLLOUT_TRIGGER_NEXT_CONFIRMATION_DIALOG) + .caption(caption).question(question).onSaveOrUpdate(() -> { + try { + rolloutManagement.triggerNextGroup(rolloutId); + uiNotification.displaySuccess(i18n.getMessage("message.rollout.trigger.next.group.success")); + } catch (final RolloutIllegalStateException e) { + LOGGER.warn("Error on manually triggering next rollout group: {}", e.getMessage()); + uiNotification + .displayValidationError(i18n.getMessage("message.rollout.trigger.next.group.error")); + } + }).build(); + } + private String getDistributionCellStyle(final ProxyRollout rollout) { if (!rollout.getDsInfo().isValid()) { return SPUIDefinitions.INVALID_DISTRIBUTION; @@ -519,21 +543,4 @@ private void triggerNextRolloutGroup(final Long rolloutId, final RolloutStatus r triggerNextDialog.getWindow().bringToFront(); } } - - private ConfirmationDialog createTriggerNextGroupDialog(final Long rolloutId) { - final String caption = i18n.getMessage("caption.rollout.confirm.trigger.next"); - final String question = i18n.getMessage("message.rollout.confirm.trigger.next"); - - return ConfirmationDialog.newBuilder(i18n, UIComponentIdProvider.ROLLOUT_TRIGGER_NEXT_CONFIRMATION_DIALOG) - .caption(caption).question(question).onSaveOrUpdate(() -> { - try { - rolloutManagement.triggerNextGroup(rolloutId); - uiNotification.displaySuccess(i18n.getMessage("message.rollout.trigger.next.group.success")); - } catch (final RolloutIllegalStateException e) { - LOGGER.warn("Error on manually triggering next rollout group: {}", e.getMessage()); - uiNotification - .displayValidationError(i18n.getMessage("message.rollout.trigger.next.group.error")); - } - }).build(); - } } diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutGridHeader.java index 0862e6eb62..8bba2af04f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.rollout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutGridLayout.java index 1f5888de32..1f6d6793ca 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.rollout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupGrid.java index 135a7faa9c..b17e1e2194 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.rolloutgroup; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupGridHeader.java index f32d5aa9bd..f17691dd06 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.rolloutgroup; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupGridLayout.java index 600e7f9dba..c1b5423309 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.rolloutgroup; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetGrid.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetGrid.java index 8ebd94136f..4142c62548 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetGrid.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetGrid.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.rolloutgrouptargets; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetGridHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetGridHeader.java index 01ed2d5146..67538624f7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetGridHeader.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetGridHeader.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.rolloutgrouptargets; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetGridLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetGridLayout.java index e41d63300a..09b5a6184b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetGridLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetGridLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.rolloutgrouptargets; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/RolloutWindowBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/RolloutWindowBuilder.java index 39c26d3661..37d87f3923 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/RolloutWindowBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/RolloutWindowBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/RolloutWindowDependencies.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/RolloutWindowDependencies.java index 00a8e1b54c..ae5478f769 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/RolloutWindowDependencies.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/RolloutWindowDependencies.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/RolloutWindowLayoutComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/RolloutWindowLayoutComponentBuilder.java index da9d5f48f8..44e438777f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/RolloutWindowLayoutComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/RolloutWindowLayoutComponentBuilder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/AdvancedGroupRow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/AdvancedGroupRow.java index 3d1492acc7..f0391df27e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/AdvancedGroupRow.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/AdvancedGroupRow.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.components; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/AdvancedGroupsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/AdvancedGroupsLayout.java index 211b3c80ea..bc38af7874 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/AdvancedGroupsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/AdvancedGroupsLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.components; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/ApprovalLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/ApprovalLayout.java index dadbe95bfb..d94e6f433a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/ApprovalLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/ApprovalLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.components; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/AutoStartOptionGroupLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/AutoStartOptionGroupLayout.java index dfdd3c3fe5..57c2bea3a2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/AutoStartOptionGroupLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/AutoStartOptionGroupLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.components; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/GroupsLegendLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/GroupsLegendLayout.java index 2dcb5ab7fe..a0af568338 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/GroupsLegendLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/GroupsLegendLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.components; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/RolloutFormLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/RolloutFormLayout.java index 36cf5f2f60..b8912bfab8 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/RolloutFormLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/RolloutFormLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.components; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/SimpleGroupsLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/SimpleGroupsLayout.java index 4eb79ebccf..0f7140b8da 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/SimpleGroupsLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/SimpleGroupsLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.components; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/ValidatableLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/ValidatableLayout.java index 1526347a69..8f704cd248 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/ValidatableLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/ValidatableLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.components; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/VisualGroupDefinitionLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/VisualGroupDefinitionLayout.java index b7a3fff13a..9e09c9cd39 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/VisualGroupDefinitionLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/components/VisualGroupDefinitionLayout.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.components; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/AddRolloutWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/AddRolloutWindowController.java index bddb5a620c..4922df329e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/AddRolloutWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/AddRolloutWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.controllers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/ApproveRolloutWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/ApproveRolloutWindowController.java index a5a84ca623..4b7b156d92 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/ApproveRolloutWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/ApproveRolloutWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.controllers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/CopyRolloutWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/CopyRolloutWindowController.java index e6bed0957b..5d1379e61b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/CopyRolloutWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/CopyRolloutWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.controllers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/ProxyRolloutValidator.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/ProxyRolloutValidator.java index dc7bc494b6..d8e24af545 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/ProxyRolloutValidator.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/ProxyRolloutValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.controllers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/UpdateRolloutWindowController.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/UpdateRolloutWindowController.java index b494af09ec..e2413e7b9c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/UpdateRolloutWindowController.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/controllers/UpdateRolloutWindowController.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.controllers; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/AbstractRolloutWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/AbstractRolloutWindowLayout.java index 12c09b1fd0..0faf20f44b 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/AbstractRolloutWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/AbstractRolloutWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.layouts; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/AddRolloutWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/AddRolloutWindowLayout.java index 4345b47c97..7eab5287e0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/AddRolloutWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/AddRolloutWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.layouts; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/ApproveRolloutWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/ApproveRolloutWindowLayout.java index c5a060bd8c..29208e7a22 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/ApproveRolloutWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/ApproveRolloutWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.layouts; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/UpdateRolloutWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/UpdateRolloutWindowLayout.java index d5e69d4602..ee4be99d53 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/UpdateRolloutWindowLayout.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/window/layouts/UpdateRolloutWindowLayout.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.rollout.window.layouts; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java index ed69fbb63b..ec02588271 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/BaseConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/BaseConfigurationView.java index 97c4f66715..f4a7cd8156 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/BaseConfigurationView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/BaseConfigurationView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/ConfigurationGroup.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/ConfigurationGroup.java index 033d2a76ef..bd894d9439 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/ConfigurationGroup.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/ConfigurationGroup.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/ConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/ConfigurationItem.java index 856b2090d2..08a34b4e9c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/ConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/ConfigurationItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeView.java index aca2ec16e3..d40bdd3efb 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java index 9974b301f1..af7bad33a6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/RepositoryConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/RepositoryConfigurationView.java index b495a4ff3e..6a90a6687f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/RepositoryConfigurationView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/RepositoryConfigurationView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/RolloutConfigurationView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/RolloutConfigurationView.java index 26cedcebcb..dd0d41f233 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/RolloutConfigurationView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/RolloutConfigurationView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/SystemConfigViewAutoConfiguration.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/SystemConfigViewAutoConfiguration.java index 27de78a034..665aea3969 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/SystemConfigViewAutoConfiguration.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/SystemConfigViewAutoConfiguration.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java index bb9ac3a008..c147268181 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardViewMenuItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardViewMenuItem.java index 920fbb8628..526dc4f665 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardViewMenuItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardViewMenuItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/AnonymousDownloadAuthenticationConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/AnonymousDownloadAuthenticationConfigurationItem.java index 2f39429ec9..db6b20c40f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/AnonymousDownloadAuthenticationConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/AnonymousDownloadAuthenticationConfigurationItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.authentication; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java index a6e67a22f8..09cf4df051 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.authentication; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java index ca213fa5f2..efe4804c9f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.authentication; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/TargetSecurityTokenAuthenticationConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/TargetSecurityTokenAuthenticationConfigurationItem.java index 83b2d92755..521aa8e4dc 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/TargetSecurityTokenAuthenticationConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/TargetSecurityTokenAuthenticationConfigurationItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.authentication; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/generic/AbstractBooleanTenantConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/generic/AbstractBooleanTenantConfigurationItem.java index f679897396..40f936a97e 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/generic/AbstractBooleanTenantConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/generic/AbstractBooleanTenantConfigurationItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.generic; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/generic/BooleanConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/generic/BooleanConfigurationItem.java index 953441d340..dfe0f3f3d3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/generic/BooleanConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/generic/BooleanConfigurationItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.generic; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java index c75176c935..afe127edf9 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.polling; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationField.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationField.java index 687d364490..e45b38679a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationField.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationField.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.polling; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/ActionAutoCleanupConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/ActionAutoCleanupConfigurationItem.java index afa7ab1984..d8a3069432 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/ActionAutoCleanupConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/ActionAutoCleanupConfigurationItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.repository; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/ActionAutoCloseConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/ActionAutoCloseConfigurationItem.java index 98022a6dee..e4b42dac17 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/ActionAutoCloseConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/ActionAutoCloseConfigurationItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.repository; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/ConfirmationFlowConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/ConfirmationFlowConfigurationItem.java index 0aaefb061c..e44d167191 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/ConfirmationFlowConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/ConfirmationFlowConfigurationItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.repository; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/MultiAssignmentsConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/MultiAssignmentsConfigurationItem.java index 7c3807c62a..1fc47df583 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/MultiAssignmentsConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/repository/MultiAssignmentsConfigurationItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2020 Bosch.IO GmbH and others. + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.repository; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/rollout/ApprovalConfigurationItem.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/rollout/ApprovalConfigurationItem.java index 3dfe62364f..98f312c0c7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/rollout/ApprovalConfigurationItem.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/rollout/ApprovalConfigurationItem.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.rollout; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/window/SystemConfigWindowDependencies.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/window/SystemConfigWindowDependencies.java index 890144ac0e..3272538a92 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/window/SystemConfigWindowDependencies.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/window/SystemConfigWindowDependencies.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.window; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/window/SystemConfigWindowLayoutComponentBuilder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/window/SystemConfigWindowLayoutComponentBuilder.java index f28b7be1f0..6959915fe6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/window/SystemConfigWindowLayoutComponentBuilder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/window/SystemConfigWindowLayoutComponentBuilder.java @@ -1,10 +1,11 @@ -/** - * Copyright (c) 2020 Bosch.IO GmbH and others. +/** + * Copyright (c) 2020 Bosch.IO GmbH and others + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.tenantconfiguration.window; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/themes/HawkbitTheme.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/themes/HawkbitTheme.java index 65060262a8..80fe434618 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/themes/HawkbitTheme.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/themes/HawkbitTheme.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.themes; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java index 65dcdcd98e..89096e19a0 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/NumericInputValidator.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/NumericInputValidator.java index 1b7f650656..6266b3f781 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/NumericInputValidator.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/NumericInputValidator.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2023 Bosch.IO GmbH and others. + * Copyright (c) 2023 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPDateTimeUtil.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPDateTimeUtil.java index 60c35227cf..fbf3d31303 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPDateTimeUtil.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPDateTimeUtil.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java index 9c52db20e1..ed82024e18 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIDefinitions.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUILabelDefinitions.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUILabelDefinitions.java index 56327c6765..ac6a133f56 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUILabelDefinitions.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUILabelDefinitions.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIStyleDefinitions.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIStyleDefinitions.java index ab325781d7..a73ceef5a2 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIStyleDefinitions.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIStyleDefinitions.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUITargetDefinitions.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUITargetDefinitions.java index b1498f6816..c96388800a 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUITargetDefinitions.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUITargetDefinitions.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/ShortCutModifierUtils.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/ShortCutModifierUtils.java index b844caafde..4766b6e791 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/ShortCutModifierUtils.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/ShortCutModifierUtils.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SpringContextHolder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SpringContextHolder.java index da23f951c3..1d5b77dc7f 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SpringContextHolder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SpringContextHolder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/StringHtmlEncoder.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/StringHtmlEncoder.java index 07b03f09c4..1c66b723a3 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/StringHtmlEncoder.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/StringHtmlEncoder.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2022 Bosch.IO GmbH and others. + * Copyright (c) 2022 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/TrimmingStringConverter.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/TrimmingStringConverter.java index 74eef2e8a4..339fbe812c 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/TrimmingStringConverter.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/TrimmingStringConverter.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2023 Bosch.IO GmbH and others. + * Copyright (c) 2023 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java index ccf0473131..b6408c33b7 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIComponentIdProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; @@ -1580,12 +1581,6 @@ public final class UIComponentIdProvider { */ public static final String TARGET_SEARCH_ATTRIBUTES = "target.search.attributes.checkbox"; - /** - * Configuration checkbox for - * {@link TenantConfigurationKey#TRIGGER_AUTO_ASSIGN_CHECK_BY_TARGET} - */ - public static final String TRIGGER_AUTOASSIGN_CHECK_BY_TARGET = "trigger.autoassign.check.checkbox"; - /** * Id of the rollout approval remark field */ diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIMessageIdProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIMessageIdProvider.java index 725553afd1..2b7343acd6 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIMessageIdProvider.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UIMessageIdProvider.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2018 Bosch Software Innovations GmbH and others. + * Copyright (c) 2018 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UINotification.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UINotification.java index 80dbce3445..43073ad911 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UINotification.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/UINotification.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/VaadinMessageSource.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/VaadinMessageSource.java index cb5e3cbbea..6f10b57791 100644 --- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/VaadinMessageSource.java +++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/VaadinMessageSource.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/main/resources/VAADIN/js/dynamicStylesheet.js b/hawkbit-ui/src/main/resources/VAADIN/js/dynamicStylesheet.js index 0cc2f568ca..083d181f4b 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/js/dynamicStylesheet.js +++ b/hawkbit-ui/src/main/resources/VAADIN/js/dynamicStylesheet.js @@ -1,10 +1,11 @@ -/* - * Copyright (c) 2020 Bosch.IO GmbH and others. +/* + * Copyright (c) 2020 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ function recreateStylesheet(styleId) { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/accordion.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/accordion.scss index 6adc2851dd..4a71faa674 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/accordion.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/accordion.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/action-history.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/action-history.scss index 54b4f06f72..e46b1ecdb9 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/action-history.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/action-history.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ @mixin action-history { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/artifact-upload.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/artifact-upload.scss index 0718967506..d4b261f94a 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/artifact-upload.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/artifact-upload.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/colorpicker.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/colorpicker.scss index 8a23f04fb0..f7ff9b4b6b 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/colorpicker.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/colorpicker.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder @mixin colorpicker { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss index 0b78949d42..ceef0ded40 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/common.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder @include keyframes(animate-in-scale-up) { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/drop-hint.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/drop-hint.scss index e803a53d5c..204ddb0241 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/drop-hint.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/drop-hint.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder @mixin drop-hint { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/filter-layout-styles.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/filter-layout-styles.scss index 2aad875466..f4d26e9a52 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/filter-layout-styles.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/filter-layout-styles.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder @mixin filter-layout-styles { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/filter-status.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/filter-status.scss index 9ea6a9adb0..beeea7562f 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/filter-status.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/filter-status.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder @mixin filter-status { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/generic-styles.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/generic-styles.scss index 20252f5e52..1e86d6c4ee 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/generic-styles.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/generic-styles.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/grid.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/grid.scss index fb75224545..1e2a9c89cb 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/grid.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/grid.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ @mixin grid { .v-grid-cell.centeralign { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/hawkbitvariables.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/hawkbitvariables.scss index c58b4146ad..48a15d5671 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/hawkbitvariables.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/hawkbitvariables.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ //Standard colors $hawkbit-primary-color: #551f62; diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/login.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/login.scss index dbaf3bbab0..0fc7f0170c 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/login.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/login.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/notification-unread-change.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/notification-unread-change.scss index 283daff91c..7a4128554b 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/notification-unread-change.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/notification-unread-change.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ @mixin notification-unread-change { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/others.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/others.scss index abce5c2bfa..467da61b3c 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/others.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/others.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder @mixin others { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss index 6c418eb384..2316d6efaa 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder @mixin popup-common { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss index d100ea4e33..143ab003b6 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-window.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss index d14632077a..6545f2697e 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/rollout.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ @mixin rollout { .rollout-option-group{ diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/statusprogressbar.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/statusprogressbar.scss index 87c5b5da51..e86450fc9e 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/statusprogressbar.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/statusprogressbar.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ @mixin statusprogressbar { .alump-dbar { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/systemconfig.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/systemconfig.scss index 19fb0cd13f..e26f8a2b6e 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/systemconfig.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/systemconfig.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-common.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-common.scss index e82e13e2c4..1c706d0639 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-common.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-common.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-content.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-content.scss index 8916f4b32b..bac588c122 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-content.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-content.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-header-common.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-header-common.scss index 4085673168..ebbe2255d6 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-header-common.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table-header-common.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder @mixin table-header-common { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table.scss index 6ac61f792a..c68a574ac5 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/table.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder @import "table-content.scss"; diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/tags.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/tags.scss index f7c60f30f8..308779eaac 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/tags.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/tags.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder @mixin tags { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/target-filter-query.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/target-filter-query.scss index c66279caab..2921270b18 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/target-filter-query.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/target-filter-query.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ @mixin target-filter-query { diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/hawkbittheme.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/hawkbittheme.scss index 95dc83d0db..6628928603 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/hawkbittheme.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/hawkbittheme.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ // scss-lint:disable ImportantRule, PropertySortOrder, VendorPrefix diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/layouts/footer.html b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/layouts/footer.html index de102b5740..c44ee8e197 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/layouts/footer.html +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/layouts/footer.html @@ -1,11 +1,12 @@ diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/styles.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/styles.scss index f740c76fd8..4ad02adfd5 100644 --- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/styles.scss +++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/styles.scss @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ @import "customstyles/hawkbitvariables"; @import "../hawkbit/hawkbittheme"; diff --git a/hawkbit-ui/src/main/resources/hawkbit-ui-defaults.properties b/hawkbit-ui/src/main/resources/hawkbit-ui-defaults.properties index 8f93fb0bca..6f56908b36 100644 --- a/hawkbit-ui/src/main/resources/hawkbit-ui-defaults.properties +++ b/hawkbit-ui/src/main/resources/hawkbit-ui-defaults.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. +# Copyright (c) 2015 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # # Vaadin Servlet diff --git a/hawkbit-ui/src/main/resources/messages.properties b/hawkbit-ui/src/main/resources/messages.properties index 86493c6f6d..53768c48f1 100644 --- a/hawkbit-ui/src/main/resources/messages.properties +++ b/hawkbit-ui/src/main/resources/messages.properties @@ -1,10 +1,11 @@ # -# Copyright (c) 2015 Bosch Software Innovations GmbH and others. +# Copyright (c) 2015 Bosch Software Innovations GmbH and others # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 # ######################################################################################### diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/artifacts/state/ArtifactUploadStateTest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/artifacts/state/ArtifactUploadStateTest.java index 383c2cbf42..2e4630fa83 100644 --- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/artifacts/state/ArtifactUploadStateTest.java +++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/artifacts/state/ArtifactUploadStateTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.artifacts.state; diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/error/HawkbitUIErrorHandlerTest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/error/HawkbitUIErrorHandlerTest.java index 856bd4ed5e..91eeb0e5f8 100644 --- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/error/HawkbitUIErrorHandlerTest.java +++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/error/HawkbitUIErrorHandlerTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error; diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/error/UiErrorDetailsExtractorsTest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/error/UiErrorDetailsExtractorsTest.java index d1e9213015..c87d363b50 100644 --- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/error/UiErrorDetailsExtractorsTest.java +++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/error/UiErrorDetailsExtractorsTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2021 Bosch.IO GmbH and others. + * Copyright (c) 2021 Bosch.IO GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.error; diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtilTest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtilTest.java index 2ae22d5deb..22e72daa9b 100644 --- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtilTest.java +++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtilTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2019 Bosch Software Innovations GmbH and others. + * Copyright (c) 2019 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/SPUIComponentProviderTest.java b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/SPUIComponentProviderTest.java index f1f1e10fc3..c7e951ba16 100644 --- a/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/SPUIComponentProviderTest.java +++ b/hawkbit-ui/src/test/java/org/eclipse/hawkbit/ui/utils/SPUIComponentProviderTest.java @@ -1,10 +1,11 @@ /** - * Copyright (c) 2015 Bosch Software Innovations GmbH and others. + * Copyright (c) 2015 Bosch Software Innovations GmbH and others * - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 */ package org.eclipse.hawkbit.ui.utils; diff --git a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH.txt b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH.txt deleted file mode 100644 index 111acb8675..0000000000 --- a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH.txt +++ /dev/null @@ -1,6 +0,0 @@ -Copyright (c) 2015 Bosch Software Innovations GmbH and others. - -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html diff --git a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_15.txt b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_15.txt new file mode 100644 index 0000000000..d6f7485ef6 --- /dev/null +++ b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_15.txt @@ -0,0 +1,7 @@ +Copyright (c) 2015 Bosch Software Innovations GmbH and others + +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_18.txt b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_18.txt index feec060929..e3e7a9ff5c 100644 --- a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_18.txt +++ b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_18.txt @@ -1,6 +1,7 @@ -Copyright (c) 2018 Bosch Software Innovations GmbH and others. +Copyright (c) 2018 Bosch Software Innovations GmbH and others -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_19.txt b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_19.txt index a7a86f8742..1d79bd02ff 100644 --- a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_19.txt +++ b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_19.txt @@ -1,6 +1,7 @@ -Copyright (c) 2019 Bosch Software Innovations GmbH and others. +Copyright (c) 2019 Bosch Software Innovations GmbH and others -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_20.txt b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_20.txt index c88b45b847..971c53e307 100644 --- a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_20.txt +++ b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_20.txt @@ -1,6 +1,7 @@ -Copyright (c) 2020 Bosch.IO GmbH and others. +Copyright (c) 2020 Bosch.IO GmbH and others -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_21.txt b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_21.txt index a1239d1507..41867636cc 100644 --- a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_21.txt +++ b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_21.txt @@ -1,6 +1,7 @@ -Copyright (c) 2021 Bosch.IO GmbH and others. +Copyright (c) 2021 Bosch.IO GmbH and others -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_22.txt b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_22.txt index d31158714a..e4e1f0bdd2 100644 --- a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_22.txt +++ b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_22.txt @@ -1,6 +1,7 @@ -Copyright (c) 2022 Bosch.IO GmbH and others. +Copyright (c) 2022 Bosch.IO GmbH and others -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_23.txt b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_23.txt index 50d957ae4e..bd044dcaa2 100644 --- a/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_23.txt +++ b/licenses/LICENSE_HEADER_TEMPLATE_BOSCH_23.txt @@ -1,6 +1,7 @@ -Copyright (c) 2023 Bosch.IO GmbH and others. +Copyright (c) 2023 Bosch.IO GmbH and others -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/licenses/LICENSE_HEADER_TEMPLATE_DEVOLO_19.txt b/licenses/LICENSE_HEADER_TEMPLATE_DEVOLO_19.txt index c941322a57..a801c79c15 100644 --- a/licenses/LICENSE_HEADER_TEMPLATE_DEVOLO_19.txt +++ b/licenses/LICENSE_HEADER_TEMPLATE_DEVOLO_19.txt @@ -1,6 +1,7 @@ Copyright (c) 2019 devolo GmbH and others. -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/licenses/LICENSE_HEADER_TEMPLATE_DEVOLO_20.txt b/licenses/LICENSE_HEADER_TEMPLATE_DEVOLO_20.txt index 06f5836611..a521e35bf3 100644 --- a/licenses/LICENSE_HEADER_TEMPLATE_DEVOLO_20.txt +++ b/licenses/LICENSE_HEADER_TEMPLATE_DEVOLO_20.txt @@ -1,6 +1,7 @@ Copyright (c) 2020 devolo GmbH and others. -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/licenses/LICENSE_HEADER_TEMPLATE_ENAPTER.txt b/licenses/LICENSE_HEADER_TEMPLATE_ENAPTER.txt index 91f2d3775e..461b105555 100644 --- a/licenses/LICENSE_HEADER_TEMPLATE_ENAPTER.txt +++ b/licenses/LICENSE_HEADER_TEMPLATE_ENAPTER.txt @@ -1,6 +1,7 @@ -Copyright (c) 2020 Enapter Co.,Ltd. +Copyright (c) 2020 Enapter Co.,Ltd -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/licenses/LICENSE_HEADER_TEMPLATE_KIWIGRID_19.txt b/licenses/LICENSE_HEADER_TEMPLATE_KIWIGRID_19.txt index 4957bc6ea0..424e236ce7 100644 --- a/licenses/LICENSE_HEADER_TEMPLATE_KIWIGRID_19.txt +++ b/licenses/LICENSE_HEADER_TEMPLATE_KIWIGRID_19.txt @@ -1,6 +1,7 @@ -Copyright (c) 2019 Kiwigrid GmbH and others. +Copyright (c) 2019 Kiwigrid GmbH and others -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/licenses/LICENSE_HEADER_TEMPLATE_MICROSOFT_18.txt b/licenses/LICENSE_HEADER_TEMPLATE_MICROSOFT_18.txt index e12e85e2c6..095ae4bc89 100644 --- a/licenses/LICENSE_HEADER_TEMPLATE_MICROSOFT_18.txt +++ b/licenses/LICENSE_HEADER_TEMPLATE_MICROSOFT_18.txt @@ -1,6 +1,7 @@ -Copyright (c) 2018 Microsoft and others. +Copyright (c) 2018 Microsoft and others -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/licenses/LICENSE_HEADER_TEMPLATE_MICROSOFT_20.txt b/licenses/LICENSE_HEADER_TEMPLATE_MICROSOFT_20.txt index fc2ac22c39..8dcb0590e5 100644 --- a/licenses/LICENSE_HEADER_TEMPLATE_MICROSOFT_20.txt +++ b/licenses/LICENSE_HEADER_TEMPLATE_MICROSOFT_20.txt @@ -1,6 +1,7 @@ -Copyright (c) 2020 Microsoft and others. +Copyright (c) 2020 Microsoft and others -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/licenses/LICENSE_HEADER_TEMPLATE_SIEMENS.txt b/licenses/LICENSE_HEADER_TEMPLATE_SIEMENS.txt index f2e3d50185..3fd44ee243 100644 --- a/licenses/LICENSE_HEADER_TEMPLATE_SIEMENS.txt +++ b/licenses/LICENSE_HEADER_TEMPLATE_SIEMENS.txt @@ -1,6 +1,7 @@ -Copyright (c) Siemens AG, 2017 +Copyright (c) 2017 Siemens AG -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/licenses/LICENSE_HEADER_TEMPLATE_SIEMENS_18.txt b/licenses/LICENSE_HEADER_TEMPLATE_SIEMENS_18.txt index 924efd1a10..7281630b8c 100644 --- a/licenses/LICENSE_HEADER_TEMPLATE_SIEMENS_18.txt +++ b/licenses/LICENSE_HEADER_TEMPLATE_SIEMENS_18.txt @@ -1,6 +1,7 @@ -Copyright (c) Siemens AG, 2018 +Copyright (c) 2018 Siemens AG -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 -which accompanies this distribution, and is available at -http://www.eclipse.org/legal/epl-v10.html +This program and the accompanying materials are made +available under the terms of the Eclipse Public License 2.0 +which is available at https://www.eclipse.org/legal/epl-2.0/ + +SPDX-License-Identifier: EPL-2.0 \ No newline at end of file diff --git a/pom.xml b/pom.xml index cf69ffdec3..71b3443906 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,12 @@ org.springframework.boot spring-boot-starter-parent - 2.7.14 + 2.7.17 org.eclipse.hawkbit @@ -27,8 +28,9 @@ - Eclipse Public License - Version 1.0 - http://www.eclipse.org/org/documents/epl-v10.php + EPL-2.0 + https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + Eclipse Public License - Version 2.0 @@ -104,6 +106,15 @@ Committer + + avgustinmm + Avgustin.Marinov@bosch.com + Bosch + https://www.bosch.io + + Committer + + @@ -132,34 +143,29 @@ 17 - 2.7.14 - 2021.0.5 + 2.7.17 + 2021.0.8 2.0.0.RELEASE - 5.7.10 + 5.7.11 + + + 1.7.0 1.33 - - 2.7.8 - - 2.14.2 - - - - 5.7.7 - - 2.2.220 + + 2.2.222 - 5.0.0 + 5.1.0 - 2.7.12 + 2.7.13 2.7.9.1 @@ -188,8 +194,7 @@ ${docker.memory.size} ${docker.gc.settings} -XX:+HeapDumpOnOutOfMemoryError -XX:+ExitOnOutOfMemoryError -Djava.security.egd=file:/dev/./urandom - - 17.0.8_7-jre-alpine + 17.0.9_9-jre-alpine 2.0.1 @@ -203,29 +208,19 @@ 1 - 2.13.10 - 2.7.11 - 2.7.9.1 - 1.1.8 - 30.1.1-jre - 1.1.7 - 3.1.2 9.2.1 1.16.1 2.3.1 - 32.1.1-jre + 32.1.2-jre 3.0.0 2.13.0 2.1.0 1.8.0 - 2.23.0 + 2.24.0 4.2.0 - - 1.2.9 - @@ -435,7 +430,7 @@ licenses/LICENSE_HEADER_TEMPLATE_SIEMENS.txt licenses/LICENSE_HEADER_TEMPLATE_SIEMENS_18.txt - licenses/LICENSE_HEADER_TEMPLATE_BOSCH.txt + licenses/LICENSE_HEADER_TEMPLATE_BOSCH_15.txt licenses/LICENSE_HEADER_TEMPLATE_BOSCH_18.txt licenses/LICENSE_HEADER_TEMPLATE_BOSCH_19.txt licenses/LICENSE_HEADER_TEMPLATE_BOSCH_20.txt @@ -470,6 +465,7 @@ docs/layouts/** docs/static/** docs/*.toml + **/spring.factories **/LICENSE* @@ -744,11 +740,6 @@ javax.el-api ${javax.el-api.version} - - net.sf.corn - corn-cps - ${corn-cps.version} - com.github.gwtd3 gwt-d3-api @@ -871,6 +862,18 @@ ${spring.security.oauth2.client.version} + + + org.springdoc + springdoc-openapi-ui + ${springdoc-openapi.version} + + + org.springdoc + springdoc-openapi-security + ${springdoc-openapi.version} + + io.protostuff