Skip to content

Commit 7377c5d

Browse files
author
abattagl
committed
fixed package names
1 parent 8987507 commit 7377c5d

26 files changed

+193
-173
lines changed

‎pom.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>org.qiot.covid19.edge</groupId>
88
<artifactId>edge-sensors-emulator</artifactId>
9-
<version>1.0.1</version>
9+
<version>1.1.0</version>
1010
<properties>
11-
<surefire-plugin.version>2.22.1</surefire-plugin.version>
12-
<maven.compiler.target>11</maven.compiler.target>
13-
<quarkus.platform.version>1.10.5.Final</quarkus.platform.version>
11+
<compiler-plugin.version>3.8.1</compiler-plugin.version>
12+
<maven.compiler.parameters>true</maven.compiler.parameters>
1413
<maven.compiler.source>11</maven.compiler.source>
14+
<maven.compiler.target>11</maven.compiler.target>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
16-
<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
1716
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
18-
<maven.compiler.parameters>true</maven.compiler.parameters>
19-
<quarkus-plugin.version>1.10.5.Final</quarkus-plugin.version>
20-
<compiler-plugin.version>3.8.1</compiler-plugin.version>
17+
<quarkus-plugin.version>1.11.1.Final</quarkus-plugin.version>
18+
<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
2119
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
20+
<quarkus.platform.version>1.11.1.Final</quarkus.platform.version>
21+
<surefire-plugin.version>2.22.1</surefire-plugin.version>
2222
</properties>
2323
<dependencyManagement>
2424
<dependencies>

‎src/main/java/org/qiot/covid19/edge/emulator/domain/GasBean.java ‎src/main/java/io/qiot/covid19/edge/emulator/domain/GasBean.java

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
package org.qiot.covid19.edge.emulator.domain;
1+
package io.qiot.covid19.edge.emulator.domain;
22

33

4+
import javax.json.bind.annotation.JsonbProperty;
5+
46
import io.quarkus.runtime.annotations.RegisterForReflection;
57

68

79
@RegisterForReflection
810
public class GasBean {
911

12+
@JsonbProperty(value = "adc", nillable = true)
1013
private Double adc;
11-
private Double nh3;
12-
private Double oxidising;
13-
private Double reducing;
14+
@JsonbProperty(value = "nh3", nillable = false)
15+
private double nh3;
16+
@JsonbProperty(value = "oxidising", nillable = false)
17+
private double oxidising;
18+
@JsonbProperty(value = "reducing", nillable = false)
19+
private double reducing;
1420

1521
public Double getAdc() {
1622
return adc;

‎src/main/java/org/qiot/covid19/edge/emulator/domain/GasGeneratorConfigService.java ‎src/main/java/io/qiot/covid19/edge/emulator/domain/GasGeneratorConfigService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.qiot.covid19.edge.emulator.domain;
1+
package io.qiot.covid19.edge.emulator.domain;
22

33

44
import javax.enterprise.context.ApplicationScoped;

‎src/main/java/org/qiot/covid19/edge/emulator/domain/ParticulatesGeneratorConfigService.java ‎src/main/java/io/qiot/covid19/edge/emulator/domain/ParticulatesGeneratorConfigService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.qiot.covid19.edge.emulator.domain;
1+
package io.qiot.covid19.edge.emulator.domain;
22

33

44
import javax.enterprise.context.ApplicationScoped;

‎src/main/java/io/qiot/covid19/edge/emulator/domain/PartuculatesBean.java

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
package io.qiot.covid19.edge.emulator.domain;
2+
3+
import javax.json.bind.annotation.JsonbProperty;
4+
5+
import io.quarkus.runtime.annotations.RegisterForReflection;
6+
7+
@RegisterForReflection
8+
public class PartuculatesBean {
9+
10+
@JsonbProperty(value = "pm1_0", nillable = false)
11+
private int pm1_0;
12+
@JsonbProperty(value = "pm2_5", nillable = false)
13+
private int pm2_5;
14+
@JsonbProperty(value = "pm10", nillable = false)
15+
private int pm10;
16+
@JsonbProperty(value = "pm1_0_atm", nillable = false)
17+
private int pm1_0_atm;
18+
@JsonbProperty(value = "pm2_5_atm", nillable = false)
19+
private int pm2_5_atm;
20+
@JsonbProperty(value = "pm10_atm", nillable = false)
21+
private int pm10_atm;
22+
@JsonbProperty(value = "gt0_3um", nillable = false)
23+
private int gt0_3um;
24+
@JsonbProperty(value = "gt0_5um", nillable = false)
25+
private int gt0_5um;
26+
@JsonbProperty(value = "gt1_0um", nillable = false)
27+
private int gt1_0um;
28+
@JsonbProperty(value = "gt2_5um", nillable = false)
29+
private int gt2_5um;
30+
@JsonbProperty(value = "gt5_0um", nillable = false)
31+
private int gt5_0um;
32+
@JsonbProperty(value = "gt10um", nillable = false)
33+
private int gt10um;
34+
35+
public int getPm1_0() {
36+
return pm1_0;
37+
}
38+
39+
public void setPm1_0(int pm1_0) {
40+
this.pm1_0 = pm1_0;
41+
}
42+
43+
public int getPm2_5() {
44+
return pm2_5;
45+
}
46+
47+
public void setPm2_5(int pm2_5) {
48+
this.pm2_5 = pm2_5;
49+
}
50+
51+
public int getPm10() {
52+
return pm10;
53+
}
54+
55+
public void setPm10(int pm10) {
56+
this.pm10 = pm10;
57+
}
58+
59+
public int getPm1_0_atm() {
60+
return pm1_0_atm;
61+
}
62+
63+
public void setPm1_0_atm(int pm1_0_atm) {
64+
this.pm1_0_atm = pm1_0_atm;
65+
}
66+
67+
public int getPm2_5_atm() {
68+
return pm2_5_atm;
69+
}
70+
71+
public void setPm2_5_atm(int pm2_5_atm) {
72+
this.pm2_5_atm = pm2_5_atm;
73+
}
74+
75+
public int getPm10_atm() {
76+
return pm10_atm;
77+
}
78+
79+
public void setPm10_atm(int pm10_atm) {
80+
this.pm10_atm = pm10_atm;
81+
}
82+
83+
public int getGt0_3um() {
84+
return gt0_3um;
85+
}
86+
87+
public void setGt0_3um(int gt0_3um) {
88+
this.gt0_3um = gt0_3um;
89+
}
90+
91+
public int getGt0_5um() {
92+
return gt0_5um;
93+
}
94+
95+
public void setGt0_5um(int gt0_5um) {
96+
this.gt0_5um = gt0_5um;
97+
}
98+
99+
public int getGt1_0um() {
100+
return gt1_0um;
101+
}
102+
103+
public void setGt1_0um(int gt1_0um) {
104+
this.gt1_0um = gt1_0um;
105+
}
106+
107+
public int getGt2_5um() {
108+
return gt2_5um;
109+
}
110+
111+
public void setGt2_5um(int gt2_5um) {
112+
this.gt2_5um = gt2_5um;
113+
}
114+
115+
public int getGt5_0um() {
116+
return gt5_0um;
117+
}
118+
119+
public void setGt5_0um(int gt5_0um) {
120+
this.gt5_0um = gt5_0um;
121+
}
122+
123+
public int getGt10um() {
124+
return gt10um;
125+
}
126+
127+
public void setGt10um(int gt10um) {
128+
this.gt10um = gt10um;
129+
}
130+
131+
@Override
132+
public String toString() {
133+
return "PartuculatesBean [pm1_0=" + pm1_0 + ", pm2_5=" + pm2_5
134+
+ ", pm10=" + pm10 + ", pm1_0_atm=" + pm1_0_atm + ", pm2_5_atm="
135+
+ pm2_5_atm + ", pm10_atm=" + pm10_atm + ", gt0_3um=" + gt0_3um
136+
+ ", gt0_5um=" + gt0_5um + ", gt1_0um=" + gt1_0um + ", gt2_5um="
137+
+ gt2_5um + ", gt5_0um=" + gt5_0um + ", gt10um=" + gt10um + "]";
138+
}
139+
140+
}

‎src/main/java/io/qiot/covid19/edge/emulator/domain/package-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package io.qiot.covid19.edge.emulator.domain;

‎src/main/java/io/qiot/covid19/edge/emulator/package-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package io.qiot.covid19.edge.emulator;

‎src/main/java/org/qiot/covid19/edge/emulator/rest/GasResource.java ‎src/main/java/io/qiot/covid19/edge/emulator/rest/GasResource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.qiot.covid19.edge.emulator.rest;
1+
package io.qiot.covid19.edge.emulator.rest;
22

33

44
import javax.enterprise.context.ApplicationScoped;
@@ -8,7 +8,7 @@
88
import javax.ws.rs.Produces;
99
import javax.ws.rs.core.MediaType;
1010

11-
import org.qiot.covid19.edge.emulator.services.GasService;
11+
import io.qiot.covid19.edge.emulator.services.GasService;
1212

1313

1414
@Path("/gas")

‎src/main/java/org/qiot/covid19/edge/emulator/rest/ParticulatesResource.java ‎src/main/java/io/qiot/covid19/edge/emulator/rest/ParticulatesResource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.qiot.covid19.edge.emulator.rest;
1+
package io.qiot.covid19.edge.emulator.rest;
22

33
import javax.enterprise.context.ApplicationScoped;
44
import javax.inject.Inject;
@@ -7,7 +7,7 @@
77
import javax.ws.rs.Produces;
88
import javax.ws.rs.core.MediaType;
99

10-
import org.qiot.covid19.edge.emulator.services.ParticulatesService;
10+
import io.qiot.covid19.edge.emulator.services.ParticulatesService;
1111

1212
@Path("/particulates")
1313
@ApplicationScoped

‎src/main/java/org/qiot/covid19/edge/emulator/rest/SystemIdResource.java ‎src/main/java/io/qiot/covid19/edge/emulator/rest/SystemIdResource.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
package io.qiot.covid19.edge.emulator.rest;
12
//package org.qiot.covid19.edge.emulator.rest;
23
//
34
//

‎src/main/java/io/qiot/covid19/edge/emulator/rest/package-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package io.qiot.covid19.edge.emulator.rest;

‎src/main/java/org/qiot/covid19/edge/emulator/services/GasService.java ‎src/main/java/io/qiot/covid19/edge/emulator/services/GasService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
*
33
*/
4-
package org.qiot.covid19.edge.emulator.services;
4+
package io.qiot.covid19.edge.emulator.services;
55

66

7-
import org.qiot.covid19.edge.emulator.domain.GasBean;
7+
import io.qiot.covid19.edge.emulator.domain.GasBean;
88

99

1010
/**

‎src/main/java/org/qiot/covid19/edge/emulator/services/GasServiceImpl.java ‎src/main/java/io/qiot/covid19/edge/emulator/services/GasServiceImpl.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
*
33
*/
4-
package org.qiot.covid19.edge.emulator.services;
4+
package io.qiot.covid19.edge.emulator.services;
55

66

77
import java.util.PrimitiveIterator;
@@ -14,14 +14,15 @@
1414
import javax.json.bind.Jsonb;
1515
import javax.json.bind.JsonbBuilder;
1616

17-
import org.qiot.covid19.edge.emulator.domain.GasBean;
18-
import org.qiot.covid19.edge.emulator.domain.GasGeneratorConfigService;
19-
import org.qiot.covid19.edge.emulator.util.RandomGeneratorProducer;
2017
import org.slf4j.Logger;
2118

2219

2320
import com.fasterxml.jackson.databind.ObjectMapper;
2421

22+
import io.qiot.covid19.edge.emulator.domain.GasBean;
23+
import io.qiot.covid19.edge.emulator.domain.GasGeneratorConfigService;
24+
import io.qiot.covid19.edge.emulator.util.RandomGeneratorProducer;
25+
2526

2627
/**
2728
* @author abattagl

‎src/main/java/org/qiot/covid19/edge/emulator/services/ParticulatesService.java ‎src/main/java/io/qiot/covid19/edge/emulator/services/ParticulatesService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
*
33
*/
4-
package org.qiot.covid19.edge.emulator.services;
4+
package io.qiot.covid19.edge.emulator.services;
55

66

7-
import org.qiot.covid19.edge.emulator.domain.PartuculatesBean;
7+
import io.qiot.covid19.edge.emulator.domain.PartuculatesBean;
88

99

1010
/**

‎src/main/java/org/qiot/covid19/edge/emulator/services/ParticulatesServiceImpl.java ‎src/main/java/io/qiot/covid19/edge/emulator/services/ParticulatesServiceImpl.java

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
*
33
*/
4-
package org.qiot.covid19.edge.emulator.services;
4+
package io.qiot.covid19.edge.emulator.services;
55

66

77
import java.util.PrimitiveIterator;
@@ -12,13 +12,14 @@
1212
import javax.json.bind.Jsonb;
1313
import javax.json.bind.JsonbBuilder;
1414

15-
import org.qiot.covid19.edge.emulator.domain.ParticulatesGeneratorConfigService;
16-
import org.qiot.covid19.edge.emulator.domain.PartuculatesBean;
17-
import org.qiot.covid19.edge.emulator.util.RandomGeneratorProducer;
1815
import org.slf4j.Logger;
1916

2017
import com.fasterxml.jackson.databind.ObjectMapper;
2118

19+
import io.qiot.covid19.edge.emulator.domain.ParticulatesGeneratorConfigService;
20+
import io.qiot.covid19.edge.emulator.domain.PartuculatesBean;
21+
import io.qiot.covid19.edge.emulator.util.RandomGeneratorProducer;
22+
2223

2324
/**
2425
* @author abattagl
@@ -87,12 +88,12 @@ private PartuculatesBean generateMeasurement() {
8788
}
8889
PartuculatesBean bean = new PartuculatesBean();
8990
// bean.setReducing(randomReducingIterator.next());
90-
bean.setPM1_0(randomPM1_0Iterator.nextInt());
91-
bean.setPM2_5(randomPM2_5Iterator.nextInt());
92-
bean.setPM10(randomPM10Iterator.nextInt());
93-
bean.setPM1_0_atm(randomPM1_0_atmIterator.nextInt());
94-
bean.setPM2_5_atm(randomPM2_5_atmIterator.nextInt());
95-
bean.setPM10_atm(randomPM10_atmIterator.nextInt());
91+
bean.setPm1_0(randomPM1_0Iterator.nextInt());
92+
bean.setPm2_5(randomPM2_5Iterator.nextInt());
93+
bean.setPm10(randomPM10Iterator.nextInt());
94+
bean.setPm1_0_atm(randomPM1_0_atmIterator.nextInt());
95+
bean.setPm2_5_atm(randomPM2_5_atmIterator.nextInt());
96+
bean.setPm10_atm(randomPM10_atmIterator.nextInt());
9697
bean.setGt0_3um(randomGt0_3umIterator.nextInt());
9798
bean.setGt0_5um(randomGt0_5umIterator.nextInt());
9899
bean.setGt1_0um(randomGt1_0umIterator.nextInt());

‎src/main/java/io/qiot/covid19/edge/emulator/services/package-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package io.qiot.covid19.edge.emulator.services;

‎src/main/java/org/qiot/covid19/edge/emulator/util/LoggerProducer.java ‎src/main/java/io/qiot/covid19/edge/emulator/util/LoggerProducer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.qiot.covid19.edge.emulator.util;
1+
package io.qiot.covid19.edge.emulator.util;
22

33
import javax.enterprise.inject.Produces;
44
import javax.enterprise.inject.spi.InjectionPoint;

‎src/main/java/org/qiot/covid19/edge/emulator/util/RandomGeneratorProducer.java ‎src/main/java/io/qiot/covid19/edge/emulator/util/RandomGeneratorProducer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.qiot.covid19.edge.emulator.util;
1+
package io.qiot.covid19.edge.emulator.util;
22

33

44
import java.util.PrimitiveIterator.OfDouble;

‎src/main/java/io/qiot/covid19/edge/emulator/util/package-info.java

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package io.qiot.covid19.edge.emulator.util;

‎src/main/java/org/qiot/covid19/edge/package-info.java ‎src/main/java/io/qiot/covid19/edge/package-info.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
* @author Andrea
66
*
77
*/
8-
package org.qiot.covid19.edge;
8+
package io.qiot.covid19.edge;

0 commit comments

Comments
 (0)