Fix lombok config. Update base openjdk image

This commit is contained in:
Igor Kulikov 2021-02-05 14:28:26 +02:00
parent e58214a2ed
commit 3f83be21da
26 changed files with 20 additions and 70 deletions

View File

@ -15,13 +15,9 @@
*/ */
package org.thingsboard.server.service.telemetry.cmd.v2; package org.thingsboard.server.service.telemetry.cmd.v2;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
@Data @Data
@AllArgsConstructor
@NoArgsConstructor(force = true)
public class AlarmDataUnsubscribeCmd implements UnsubscribeCmd { public class AlarmDataUnsubscribeCmd implements UnsubscribeCmd {
private final int cmdId; private final int cmdId;

View File

@ -15,13 +15,9 @@
*/ */
package org.thingsboard.server.service.telemetry.cmd.v2; package org.thingsboard.server.service.telemetry.cmd.v2;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
@Data @Data
@AllArgsConstructor
@NoArgsConstructor(force = true)
public class EntityDataUnsubscribeCmd implements UnsubscribeCmd { public class EntityDataUnsubscribeCmd implements UnsubscribeCmd {
private final int cmdId; private final int cmdId;

View File

@ -18,11 +18,9 @@ package org.thingsboard.server.dao.device.claim;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.Device;
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor
@Data @Data
public class ClaimResult { public class ClaimResult {

View File

@ -15,13 +15,9 @@
*/ */
package org.thingsboard.server.common.data; package org.thingsboard.server.common.data;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
@Data @Data
@AllArgsConstructor
@NoArgsConstructor(force = true)
public class ClaimRequest { public class ClaimRequest {
private final String secretKey; private final String secretKey;

View File

@ -17,12 +17,10 @@ package org.thingsboard.server.common.data;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import org.thingsboard.server.common.data.id.DashboardId; import org.thingsboard.server.common.data.id.DashboardId;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor
public class HomeDashboardInfo { public class HomeDashboardInfo {
private DashboardId dashboardId; private DashboardId dashboardId;
private boolean hideDashboardToolbar; private boolean hideDashboardToolbar;

View File

@ -17,7 +17,6 @@ package org.thingsboard.server.common.data;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter; import lombok.Setter;
import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.CustomerId;
@ -26,7 +25,6 @@ import org.thingsboard.server.common.data.id.CustomerId;
*/ */
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor
public class ShortCustomerInfo { public class ShortCustomerInfo {
@Getter @Setter @Getter @Setter

View File

@ -15,14 +15,10 @@
*/ */
package org.thingsboard.server.common.data.device.profile; package org.thingsboard.server.common.data.device.profile;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import org.thingsboard.server.common.data.DeviceProfileProvisionType; import org.thingsboard.server.common.data.DeviceProfileProvisionType;
@Data @Data
@AllArgsConstructor
@NoArgsConstructor(force = true)
public class AllowCreateNewDevicesDeviceProfileProvisionConfiguration implements DeviceProfileProvisionConfiguration { public class AllowCreateNewDevicesDeviceProfileProvisionConfiguration implements DeviceProfileProvisionConfiguration {
private final String provisionDeviceSecret; private final String provisionDeviceSecret;

View File

@ -15,14 +15,10 @@
*/ */
package org.thingsboard.server.common.data.device.profile; package org.thingsboard.server.common.data.device.profile;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import org.thingsboard.server.common.data.DeviceProfileProvisionType; import org.thingsboard.server.common.data.DeviceProfileProvisionType;
@Data @Data
@AllArgsConstructor
@NoArgsConstructor(force = true)
public class CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration implements DeviceProfileProvisionConfiguration { public class CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration implements DeviceProfileProvisionConfiguration {
private final String provisionDeviceSecret; private final String provisionDeviceSecret;

View File

@ -15,14 +15,10 @@
*/ */
package org.thingsboard.server.common.data.device.profile; package org.thingsboard.server.common.data.device.profile;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import org.thingsboard.server.common.data.DeviceProfileProvisionType; import org.thingsboard.server.common.data.DeviceProfileProvisionType;
@Data @Data
@AllArgsConstructor
@NoArgsConstructor(force = true)
public class DisabledDeviceProfileProvisionConfiguration implements DeviceProfileProvisionConfiguration { public class DisabledDeviceProfileProvisionConfiguration implements DeviceProfileProvisionConfiguration {
private final String provisionDeviceSecret; private final String provisionDeviceSecret;

View File

@ -15,9 +15,7 @@
*/ */
package org.thingsboard.server.common.data.query; package org.thingsboard.server.common.data.query;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
@ -32,11 +30,4 @@ public class DynamicValue<T> {
@Getter @Getter
private final String sourceAttribute; private final String sourceAttribute;
@JsonCreator
public DynamicValue(@JsonProperty("sourceType") DynamicValueSourceType sourceType,
@JsonProperty("sourceAttribute") String sourceAttribute) {
this.sourceType = sourceType;
this.sourceAttribute = sourceAttribute;
}
} }

View File

@ -15,16 +15,12 @@
*/ */
package org.thingsboard.server.common.data.query; package org.thingsboard.server.common.data.query;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityId;
import java.util.Map; import java.util.Map;
@Data @Data
@AllArgsConstructor
@NoArgsConstructor(force = true)
public class EntityData { public class EntityData {
private final EntityId entityId; private final EntityId entityId;

View File

@ -15,13 +15,9 @@
*/ */
package org.thingsboard.server.common.data.query; package org.thingsboard.server.common.data.query;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
@Data @Data
@AllArgsConstructor
@NoArgsConstructor(force = true)
public class EntityKey { public class EntityKey {
private final EntityKeyType type; private final EntityKeyType type;
private final String key; private final String key;

View File

@ -15,13 +15,9 @@
*/ */
package org.thingsboard.server.common.data.query; package org.thingsboard.server.common.data.query;
import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
@Data @Data
@AllArgsConstructor
@NoArgsConstructor(force = true)
public class TsValue { public class TsValue {
private final long ts; private final long ts;

View File

@ -17,7 +17,6 @@ package org.thingsboard.server.common.data.relation;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.EntityType;
import java.util.List; import java.util.List;
@ -27,7 +26,6 @@ import java.util.List;
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor
public class EntityTypeFilter { public class EntityTypeFilter {
private String relationType; private String relationType;

View File

@ -17,7 +17,6 @@ package org.thingsboard.server.common.data.relation;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import org.thingsboard.server.common.data.EntityType; import org.thingsboard.server.common.data.EntityType;
import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.id.EntityIdFactory; import org.thingsboard.server.common.data.id.EntityIdFactory;
@ -29,7 +28,6 @@ import java.util.UUID;
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor
public class RelationsSearchParameters { public class RelationsSearchParameters {
private UUID rootId; private UUID rootId;

2
lombok.config Normal file
View File

@ -0,0 +1,2 @@
config.stopbubbling = true
lombok.anyconstructor.addconstructorproperties = true

View File

@ -50,7 +50,7 @@
<plugin> <plugin>
<groupId>com.spotify</groupId> <groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId> <artifactId>dockerfile-maven-plugin</artifactId>
<version>1.4.5</version> <version>1.4.13</version>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>

View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
FROM thingsboard/openjdk8 FROM thingsboard/openjdk11
COPY start-tb-node.sh ${pkg.name}.deb /tmp/ COPY start-tb-node.sh ${pkg.name}.deb /tmp/

View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
FROM thingsboard/openjdk8 FROM thingsboard/openjdk11
RUN apt-get update RUN apt-get update
RUN apt-get install -y curl nmap procps RUN apt-get install -y curl nmap procps

View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
FROM thingsboard/openjdk8 FROM thingsboard/openjdk11
RUN apt-get update RUN apt-get update
RUN apt-get install -y curl RUN apt-get install -y curl

View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
FROM thingsboard/openjdk8 FROM thingsboard/openjdk11
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/ 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/

View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
FROM thingsboard/openjdk8 FROM thingsboard/openjdk11
COPY start-tb-coap-transport.sh ${pkg.name}.deb /tmp/ COPY start-tb-coap-transport.sh ${pkg.name}.deb /tmp/

View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
FROM thingsboard/openjdk8 FROM thingsboard/openjdk11
COPY start-tb-http-transport.sh ${pkg.name}.deb /tmp/ COPY start-tb-http-transport.sh ${pkg.name}.deb /tmp/

View File

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
FROM thingsboard/openjdk8 FROM thingsboard/openjdk11
COPY start-tb-mqtt-transport.sh ${pkg.name}.deb /tmp/ COPY start-tb-mqtt-transport.sh ${pkg.name}.deb /tmp/

13
pom.xml
View File

@ -61,9 +61,9 @@
<commons-lang3.version>3.4</commons-lang3.version> <commons-lang3.version>3.4</commons-lang3.version>
<commons-io.version>2.5</commons-io.version> <commons-io.version>2.5</commons-io.version>
<commons-csv.version>1.4</commons-csv.version> <commons-csv.version>1.4</commons-csv.version>
<jackson.version>2.11.3</jackson.version> <jackson.version>2.12.1</jackson.version>
<jackson-annotations.version>2.11.3</jackson-annotations.version> <jackson-annotations.version>2.12.1</jackson-annotations.version>
<jackson-core.version>2.11.3</jackson-core.version> <jackson-core.version>2.12.1</jackson-core.version>
<json-schema-validator.version>2.2.6</json-schema-validator.version> <json-schema-validator.version>2.2.6</json-schema-validator.version>
<californium.version>1.0.2</californium.version> <californium.version>1.0.2</californium.version>
<gson.version>2.6.2</gson.version> <gson.version>2.6.2</gson.version>
@ -554,6 +554,13 @@
<arg>-Xlint:removal</arg> <arg>-Xlint:removal</arg>
<arg>-Xlint:unchecked</arg> <arg>-Xlint:unchecked</arg>
</compilerArgs> </compilerArgs>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

View File

@ -15,15 +15,11 @@
*/ */
package org.thingsboard.rule.engine.mail; package org.thingsboard.rule.engine.mail;
import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
@Data @Data
@Builder @Builder
@AllArgsConstructor
@NoArgsConstructor(force = true)
class EmailPojo { class EmailPojo {
private final String from; private final String from;