dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix lombok config. Update base openjdk image

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/AlarmDataUnsubscribeCmd.java
View File

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

4
application/src/main/java/org/thingsboard/server/service/telemetry/cmd/v2/EntityDataUnsubscribeCmd.java
View File

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

2
common/dao-api/src/main/java/org/thingsboard/server/dao/device/claim/ClaimResult.java
View File

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

4
common/data/src/main/java/org/thingsboard/server/common/data/ClaimRequest.java
View File

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

2
common/data/src/main/java/org/thingsboard/server/common/data/HomeDashboardInfo.java
View File

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

2
common/data/src/main/java/org/thingsboard/server/common/data/ShortCustomerInfo.java
View File

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

4
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AllowCreateNewDevicesDeviceProfileProvisionConfiguration.java
View File

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

4
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration.java
View File

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

4
common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DisabledDeviceProfileProvisionConfiguration.java
View File

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

9
common/data/src/main/java/org/thingsboard/server/common/data/query/DynamicValue.java
View File

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

4
common/data/src/main/java/org/thingsboard/server/common/data/query/EntityData.java
View File

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

4
common/data/src/main/java/org/thingsboard/server/common/data/query/EntityKey.java
View File

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

4
common/data/src/main/java/org/thingsboard/server/common/data/query/TsValue.java
View File

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

2
common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityTypeFilter.java
View File

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

2
common/data/src/main/java/org/thingsboard/server/common/data/relation/RelationsSearchParameters.java
View File

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

2
lombok.config Normal file
View File

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

2
msa/pom.xml
View File

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

2
msa/tb-node/docker/Dockerfile
View File

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

2
msa/tb/docker-cassandra/Dockerfile
View File

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

2
msa/tb/docker-postgres/Dockerfile
View File

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

2
msa/tb/docker-tb/Dockerfile
View File

@ -14,7 +14,7 @@
# 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/

2
msa/transport/coap/docker/Dockerfile
View File

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

2
msa/transport/http/docker/Dockerfile
View File

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

2
msa/transport/mqtt/docker/Dockerfile
View File

@ -14,7 +14,7 @@
# limitations under the License.
#
FROM thingsboard/openjdk8
FROM thingsboard/openjdk11
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-io.version>2.5</commons-io.version>
<commons-csv.version>1.4</commons-csv.version>
<jackson.version>2.11.3</jackson.version>
<jackson-annotations.version>2.11.3</jackson-annotations.version>
<jackson-core.version>2.11.3</jackson-core.version>
<jackson.version>2.12.1</jackson.version>
<jackson-annotations.version>2.12.1</jackson-annotations.version>
<jackson-core.version>2.12.1</jackson-core.version>
<json-schema-validator.version>2.2.6</json-schema-validator.version>
<californium.version>1.0.2</californium.version>
<gson.version>2.6.2</gson.version>
@ -554,6 +554,13 @@
<arg>-Xlint:removal</arg>
<arg>-Xlint:unchecked</arg>
</compilerArgs>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>

4
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/EmailPojo.java
View File

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