Commit 3f83be21da71009469104f3ac412c507f88a9f35
1 parent
e58214a2
Fix lombok config. Update base openjdk image
Showing
26 changed files
with
20 additions
and
70 deletions
@@ -15,13 +15,9 @@ | @@ -15,13 +15,9 @@ | ||
15 | */ | 15 | */ |
16 | package org.thingsboard.server.service.telemetry.cmd.v2; | 16 | package org.thingsboard.server.service.telemetry.cmd.v2; |
17 | 17 | ||
18 | -import lombok.AllArgsConstructor; | ||
19 | import lombok.Data; | 18 | import lombok.Data; |
20 | -import lombok.NoArgsConstructor; | ||
21 | 19 | ||
22 | @Data | 20 | @Data |
23 | -@AllArgsConstructor | ||
24 | -@NoArgsConstructor(force = true) | ||
25 | public class AlarmDataUnsubscribeCmd implements UnsubscribeCmd { | 21 | public class AlarmDataUnsubscribeCmd implements UnsubscribeCmd { |
26 | 22 | ||
27 | private final int cmdId; | 23 | private final int cmdId; |
@@ -15,13 +15,9 @@ | @@ -15,13 +15,9 @@ | ||
15 | */ | 15 | */ |
16 | package org.thingsboard.server.service.telemetry.cmd.v2; | 16 | package org.thingsboard.server.service.telemetry.cmd.v2; |
17 | 17 | ||
18 | -import lombok.AllArgsConstructor; | ||
19 | import lombok.Data; | 18 | import lombok.Data; |
20 | -import lombok.NoArgsConstructor; | ||
21 | 19 | ||
22 | @Data | 20 | @Data |
23 | -@AllArgsConstructor | ||
24 | -@NoArgsConstructor(force = true) | ||
25 | public class EntityDataUnsubscribeCmd implements UnsubscribeCmd { | 21 | public class EntityDataUnsubscribeCmd implements UnsubscribeCmd { |
26 | 22 | ||
27 | private final int cmdId; | 23 | private final int cmdId; |
@@ -18,11 +18,9 @@ package org.thingsboard.server.dao.device.claim; | @@ -18,11 +18,9 @@ package org.thingsboard.server.dao.device.claim; | ||
18 | 18 | ||
19 | import lombok.AllArgsConstructor; | 19 | import lombok.AllArgsConstructor; |
20 | import lombok.Data; | 20 | import lombok.Data; |
21 | -import lombok.NoArgsConstructor; | ||
22 | import org.thingsboard.server.common.data.Device; | 21 | import org.thingsboard.server.common.data.Device; |
23 | 22 | ||
24 | @AllArgsConstructor | 23 | @AllArgsConstructor |
25 | -@NoArgsConstructor | ||
26 | @Data | 24 | @Data |
27 | public class ClaimResult { | 25 | public class ClaimResult { |
28 | 26 |
@@ -15,13 +15,9 @@ | @@ -15,13 +15,9 @@ | ||
15 | */ | 15 | */ |
16 | package org.thingsboard.server.common.data; | 16 | package org.thingsboard.server.common.data; |
17 | 17 | ||
18 | -import lombok.AllArgsConstructor; | ||
19 | import lombok.Data; | 18 | import lombok.Data; |
20 | -import lombok.NoArgsConstructor; | ||
21 | 19 | ||
22 | @Data | 20 | @Data |
23 | -@AllArgsConstructor | ||
24 | -@NoArgsConstructor(force = true) | ||
25 | public class ClaimRequest { | 21 | public class ClaimRequest { |
26 | 22 | ||
27 | private final String secretKey; | 23 | private final String secretKey; |
@@ -17,12 +17,10 @@ package org.thingsboard.server.common.data; | @@ -17,12 +17,10 @@ package org.thingsboard.server.common.data; | ||
17 | 17 | ||
18 | import lombok.AllArgsConstructor; | 18 | import lombok.AllArgsConstructor; |
19 | import lombok.Data; | 19 | import lombok.Data; |
20 | -import lombok.NoArgsConstructor; | ||
21 | import org.thingsboard.server.common.data.id.DashboardId; | 20 | import org.thingsboard.server.common.data.id.DashboardId; |
22 | 21 | ||
23 | @Data | 22 | @Data |
24 | @AllArgsConstructor | 23 | @AllArgsConstructor |
25 | -@NoArgsConstructor | ||
26 | public class HomeDashboardInfo { | 24 | public class HomeDashboardInfo { |
27 | private DashboardId dashboardId; | 25 | private DashboardId dashboardId; |
28 | private boolean hideDashboardToolbar; | 26 | private boolean hideDashboardToolbar; |
@@ -17,7 +17,6 @@ package org.thingsboard.server.common.data; | @@ -17,7 +17,6 @@ package org.thingsboard.server.common.data; | ||
17 | 17 | ||
18 | import lombok.AllArgsConstructor; | 18 | import lombok.AllArgsConstructor; |
19 | import lombok.Getter; | 19 | import lombok.Getter; |
20 | -import lombok.NoArgsConstructor; | ||
21 | import lombok.Setter; | 20 | import lombok.Setter; |
22 | import org.thingsboard.server.common.data.id.CustomerId; | 21 | import org.thingsboard.server.common.data.id.CustomerId; |
23 | 22 | ||
@@ -26,7 +25,6 @@ import org.thingsboard.server.common.data.id.CustomerId; | @@ -26,7 +25,6 @@ import org.thingsboard.server.common.data.id.CustomerId; | ||
26 | */ | 25 | */ |
27 | 26 | ||
28 | @AllArgsConstructor | 27 | @AllArgsConstructor |
29 | -@NoArgsConstructor | ||
30 | public class ShortCustomerInfo { | 28 | public class ShortCustomerInfo { |
31 | 29 | ||
32 | @Getter @Setter | 30 | @Getter @Setter |
@@ -15,14 +15,10 @@ | @@ -15,14 +15,10 @@ | ||
15 | */ | 15 | */ |
16 | package org.thingsboard.server.common.data.device.profile; | 16 | package org.thingsboard.server.common.data.device.profile; |
17 | 17 | ||
18 | -import lombok.AllArgsConstructor; | ||
19 | import lombok.Data; | 18 | import lombok.Data; |
20 | -import lombok.NoArgsConstructor; | ||
21 | import org.thingsboard.server.common.data.DeviceProfileProvisionType; | 19 | import org.thingsboard.server.common.data.DeviceProfileProvisionType; |
22 | 20 | ||
23 | @Data | 21 | @Data |
24 | -@AllArgsConstructor | ||
25 | -@NoArgsConstructor(force = true) | ||
26 | public class AllowCreateNewDevicesDeviceProfileProvisionConfiguration implements DeviceProfileProvisionConfiguration { | 22 | public class AllowCreateNewDevicesDeviceProfileProvisionConfiguration implements DeviceProfileProvisionConfiguration { |
27 | 23 | ||
28 | private final String provisionDeviceSecret; | 24 | private final String provisionDeviceSecret; |
@@ -15,14 +15,10 @@ | @@ -15,14 +15,10 @@ | ||
15 | */ | 15 | */ |
16 | package org.thingsboard.server.common.data.device.profile; | 16 | package org.thingsboard.server.common.data.device.profile; |
17 | 17 | ||
18 | -import lombok.AllArgsConstructor; | ||
19 | import lombok.Data; | 18 | import lombok.Data; |
20 | -import lombok.NoArgsConstructor; | ||
21 | import org.thingsboard.server.common.data.DeviceProfileProvisionType; | 19 | import org.thingsboard.server.common.data.DeviceProfileProvisionType; |
22 | 20 | ||
23 | @Data | 21 | @Data |
24 | -@AllArgsConstructor | ||
25 | -@NoArgsConstructor(force = true) | ||
26 | public class CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration implements DeviceProfileProvisionConfiguration { | 22 | public class CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration implements DeviceProfileProvisionConfiguration { |
27 | 23 | ||
28 | private final String provisionDeviceSecret; | 24 | private final String provisionDeviceSecret; |
@@ -15,14 +15,10 @@ | @@ -15,14 +15,10 @@ | ||
15 | */ | 15 | */ |
16 | package org.thingsboard.server.common.data.device.profile; | 16 | package org.thingsboard.server.common.data.device.profile; |
17 | 17 | ||
18 | -import lombok.AllArgsConstructor; | ||
19 | import lombok.Data; | 18 | import lombok.Data; |
20 | -import lombok.NoArgsConstructor; | ||
21 | import org.thingsboard.server.common.data.DeviceProfileProvisionType; | 19 | import org.thingsboard.server.common.data.DeviceProfileProvisionType; |
22 | 20 | ||
23 | @Data | 21 | @Data |
24 | -@AllArgsConstructor | ||
25 | -@NoArgsConstructor(force = true) | ||
26 | public class DisabledDeviceProfileProvisionConfiguration implements DeviceProfileProvisionConfiguration { | 22 | public class DisabledDeviceProfileProvisionConfiguration implements DeviceProfileProvisionConfiguration { |
27 | 23 | ||
28 | private final String provisionDeviceSecret; | 24 | private final String provisionDeviceSecret; |
@@ -15,9 +15,7 @@ | @@ -15,9 +15,7 @@ | ||
15 | */ | 15 | */ |
16 | package org.thingsboard.server.common.data.query; | 16 | package org.thingsboard.server.common.data.query; |
17 | 17 | ||
18 | -import com.fasterxml.jackson.annotation.JsonCreator; | ||
19 | import com.fasterxml.jackson.annotation.JsonIgnore; | 18 | import com.fasterxml.jackson.annotation.JsonIgnore; |
20 | -import com.fasterxml.jackson.annotation.JsonProperty; | ||
21 | import lombok.Data; | 19 | import lombok.Data; |
22 | import lombok.Getter; | 20 | import lombok.Getter; |
23 | 21 | ||
@@ -32,11 +30,4 @@ public class DynamicValue<T> { | @@ -32,11 +30,4 @@ public class DynamicValue<T> { | ||
32 | @Getter | 30 | @Getter |
33 | private final String sourceAttribute; | 31 | private final String sourceAttribute; |
34 | 32 | ||
35 | - @JsonCreator | ||
36 | - public DynamicValue(@JsonProperty("sourceType") DynamicValueSourceType sourceType, | ||
37 | - @JsonProperty("sourceAttribute") String sourceAttribute) { | ||
38 | - this.sourceType = sourceType; | ||
39 | - this.sourceAttribute = sourceAttribute; | ||
40 | - } | ||
41 | - | ||
42 | } | 33 | } |
@@ -15,16 +15,12 @@ | @@ -15,16 +15,12 @@ | ||
15 | */ | 15 | */ |
16 | package org.thingsboard.server.common.data.query; | 16 | package org.thingsboard.server.common.data.query; |
17 | 17 | ||
18 | -import lombok.AllArgsConstructor; | ||
19 | import lombok.Data; | 18 | import lombok.Data; |
20 | -import lombok.NoArgsConstructor; | ||
21 | import org.thingsboard.server.common.data.id.EntityId; | 19 | import org.thingsboard.server.common.data.id.EntityId; |
22 | 20 | ||
23 | import java.util.Map; | 21 | import java.util.Map; |
24 | 22 | ||
25 | @Data | 23 | @Data |
26 | -@AllArgsConstructor | ||
27 | -@NoArgsConstructor(force = true) | ||
28 | public class EntityData { | 24 | public class EntityData { |
29 | 25 | ||
30 | private final EntityId entityId; | 26 | private final EntityId entityId; |
@@ -15,13 +15,9 @@ | @@ -15,13 +15,9 @@ | ||
15 | */ | 15 | */ |
16 | package org.thingsboard.server.common.data.query; | 16 | package org.thingsboard.server.common.data.query; |
17 | 17 | ||
18 | -import lombok.AllArgsConstructor; | ||
19 | import lombok.Data; | 18 | import lombok.Data; |
20 | -import lombok.NoArgsConstructor; | ||
21 | 19 | ||
22 | @Data | 20 | @Data |
23 | -@AllArgsConstructor | ||
24 | -@NoArgsConstructor(force = true) | ||
25 | public class EntityKey { | 21 | public class EntityKey { |
26 | private final EntityKeyType type; | 22 | private final EntityKeyType type; |
27 | private final String key; | 23 | private final String key; |
@@ -15,13 +15,9 @@ | @@ -15,13 +15,9 @@ | ||
15 | */ | 15 | */ |
16 | package org.thingsboard.server.common.data.query; | 16 | package org.thingsboard.server.common.data.query; |
17 | 17 | ||
18 | -import lombok.AllArgsConstructor; | ||
19 | import lombok.Data; | 18 | import lombok.Data; |
20 | -import lombok.NoArgsConstructor; | ||
21 | 19 | ||
22 | @Data | 20 | @Data |
23 | -@AllArgsConstructor | ||
24 | -@NoArgsConstructor(force = true) | ||
25 | public class TsValue { | 21 | public class TsValue { |
26 | 22 | ||
27 | private final long ts; | 23 | private final long ts; |
@@ -17,7 +17,6 @@ package org.thingsboard.server.common.data.relation; | @@ -17,7 +17,6 @@ package org.thingsboard.server.common.data.relation; | ||
17 | 17 | ||
18 | import lombok.AllArgsConstructor; | 18 | import lombok.AllArgsConstructor; |
19 | import lombok.Data; | 19 | import lombok.Data; |
20 | -import lombok.NoArgsConstructor; | ||
21 | import org.thingsboard.server.common.data.EntityType; | 20 | import org.thingsboard.server.common.data.EntityType; |
22 | 21 | ||
23 | import java.util.List; | 22 | import java.util.List; |
@@ -27,7 +26,6 @@ import java.util.List; | @@ -27,7 +26,6 @@ import java.util.List; | ||
27 | */ | 26 | */ |
28 | @Data | 27 | @Data |
29 | @AllArgsConstructor | 28 | @AllArgsConstructor |
30 | -@NoArgsConstructor | ||
31 | public class EntityTypeFilter { | 29 | public class EntityTypeFilter { |
32 | 30 | ||
33 | private String relationType; | 31 | private String relationType; |
common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationsSearchParameters.java
@@ -17,7 +17,6 @@ package org.thingsboard.server.common.data.relation; | @@ -17,7 +17,6 @@ package org.thingsboard.server.common.data.relation; | ||
17 | 17 | ||
18 | import lombok.AllArgsConstructor; | 18 | import lombok.AllArgsConstructor; |
19 | import lombok.Data; | 19 | import lombok.Data; |
20 | -import lombok.NoArgsConstructor; | ||
21 | import org.thingsboard.server.common.data.EntityType; | 20 | import org.thingsboard.server.common.data.EntityType; |
22 | import org.thingsboard.server.common.data.id.EntityId; | 21 | import org.thingsboard.server.common.data.id.EntityId; |
23 | import org.thingsboard.server.common.data.id.EntityIdFactory; | 22 | import org.thingsboard.server.common.data.id.EntityIdFactory; |
@@ -29,7 +28,6 @@ import java.util.UUID; | @@ -29,7 +28,6 @@ import java.util.UUID; | ||
29 | */ | 28 | */ |
30 | @Data | 29 | @Data |
31 | @AllArgsConstructor | 30 | @AllArgsConstructor |
32 | -@NoArgsConstructor | ||
33 | public class RelationsSearchParameters { | 31 | public class RelationsSearchParameters { |
34 | 32 | ||
35 | private UUID rootId; | 33 | private UUID rootId; |
lombok.config
0 → 100644
@@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
50 | <plugin> | 50 | <plugin> |
51 | <groupId>com.spotify</groupId> | 51 | <groupId>com.spotify</groupId> |
52 | <artifactId>dockerfile-maven-plugin</artifactId> | 52 | <artifactId>dockerfile-maven-plugin</artifactId> |
53 | - <version>1.4.5</version> | 53 | + <version>1.4.13</version> |
54 | </plugin> | 54 | </plugin> |
55 | </plugins> | 55 | </plugins> |
56 | </pluginManagement> | 56 | </pluginManagement> |
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | # limitations under the License. | 14 | # limitations under the License. |
15 | # | 15 | # |
16 | 16 | ||
17 | -FROM thingsboard/openjdk8 | 17 | +FROM thingsboard/openjdk11 |
18 | 18 | ||
19 | RUN apt-get update | 19 | RUN apt-get update |
20 | RUN apt-get install -y curl nmap procps | 20 | RUN apt-get install -y curl nmap procps |
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | # limitations under the License. | 14 | # limitations under the License. |
15 | # | 15 | # |
16 | 16 | ||
17 | -FROM thingsboard/openjdk8 | 17 | +FROM thingsboard/openjdk11 |
18 | 18 | ||
19 | COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/ | 19 | COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/ |
20 | 20 |
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | # limitations under the License. | 14 | # limitations under the License. |
15 | # | 15 | # |
16 | 16 | ||
17 | -FROM thingsboard/openjdk8 | 17 | +FROM thingsboard/openjdk11 |
18 | 18 | ||
19 | COPY start-tb-coap-transport.sh ${pkg.name}.deb /tmp/ | 19 | COPY start-tb-coap-transport.sh ${pkg.name}.deb /tmp/ |
20 | 20 |
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | # limitations under the License. | 14 | # limitations under the License. |
15 | # | 15 | # |
16 | 16 | ||
17 | -FROM thingsboard/openjdk8 | 17 | +FROM thingsboard/openjdk11 |
18 | 18 | ||
19 | COPY start-tb-http-transport.sh ${pkg.name}.deb /tmp/ | 19 | COPY start-tb-http-transport.sh ${pkg.name}.deb /tmp/ |
20 | 20 |
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | # limitations under the License. | 14 | # limitations under the License. |
15 | # | 15 | # |
16 | 16 | ||
17 | -FROM thingsboard/openjdk8 | 17 | +FROM thingsboard/openjdk11 |
18 | 18 | ||
19 | COPY start-tb-mqtt-transport.sh ${pkg.name}.deb /tmp/ | 19 | COPY start-tb-mqtt-transport.sh ${pkg.name}.deb /tmp/ |
20 | 20 |
@@ -61,9 +61,9 @@ | @@ -61,9 +61,9 @@ | ||
61 | <commons-lang3.version>3.4</commons-lang3.version> | 61 | <commons-lang3.version>3.4</commons-lang3.version> |
62 | <commons-io.version>2.5</commons-io.version> | 62 | <commons-io.version>2.5</commons-io.version> |
63 | <commons-csv.version>1.4</commons-csv.version> | 63 | <commons-csv.version>1.4</commons-csv.version> |
64 | - <jackson.version>2.11.3</jackson.version> | ||
65 | - <jackson-annotations.version>2.11.3</jackson-annotations.version> | ||
66 | - <jackson-core.version>2.11.3</jackson-core.version> | 64 | + <jackson.version>2.12.1</jackson.version> |
65 | + <jackson-annotations.version>2.12.1</jackson-annotations.version> | ||
66 | + <jackson-core.version>2.12.1</jackson-core.version> | ||
67 | <json-schema-validator.version>2.2.6</json-schema-validator.version> | 67 | <json-schema-validator.version>2.2.6</json-schema-validator.version> |
68 | <californium.version>1.0.2</californium.version> | 68 | <californium.version>1.0.2</californium.version> |
69 | <gson.version>2.6.2</gson.version> | 69 | <gson.version>2.6.2</gson.version> |
@@ -554,6 +554,13 @@ | @@ -554,6 +554,13 @@ | ||
554 | <arg>-Xlint:removal</arg> | 554 | <arg>-Xlint:removal</arg> |
555 | <arg>-Xlint:unchecked</arg> | 555 | <arg>-Xlint:unchecked</arg> |
556 | </compilerArgs> | 556 | </compilerArgs> |
557 | + <annotationProcessorPaths> | ||
558 | + <path> | ||
559 | + <groupId>org.projectlombok</groupId> | ||
560 | + <artifactId>lombok</artifactId> | ||
561 | + <version>${lombok.version}</version> | ||
562 | + </path> | ||
563 | + </annotationProcessorPaths> | ||
557 | </configuration> | 564 | </configuration> |
558 | </plugin> | 565 | </plugin> |
559 | <plugin> | 566 | <plugin> |
@@ -15,15 +15,11 @@ | @@ -15,15 +15,11 @@ | ||
15 | */ | 15 | */ |
16 | package org.thingsboard.rule.engine.mail; | 16 | package org.thingsboard.rule.engine.mail; |
17 | 17 | ||
18 | -import lombok.AllArgsConstructor; | ||
19 | import lombok.Builder; | 18 | import lombok.Builder; |
20 | import lombok.Data; | 19 | import lombok.Data; |
21 | -import lombok.NoArgsConstructor; | ||
22 | 20 | ||
23 | @Data | 21 | @Data |
24 | @Builder | 22 | @Builder |
25 | -@AllArgsConstructor | ||
26 | -@NoArgsConstructor(force = true) | ||
27 | class EmailPojo { | 23 | class EmailPojo { |
28 | 24 | ||
29 | private final String from; | 25 | private final String from; |