Skip to content

Commit dee3d6f

Browse files
matthewtanner91matthewtanner91
committed
updated pom.xml and bumped servlet versions
all written tests passing, tests added to Jakarta build as well.
1 parent 1c204ed commit dee3d6f

File tree

11 files changed

+77
-13
lines changed

11 files changed

+77
-13
lines changed

‎examples-jakarta/spring-boot-starter-example-tomcat/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>com.moesif.servlet</groupId>
3535
<artifactId>moesif-servlet-jakarta</artifactId>
36-
<version>2.1.2</version>
36+
<version>2.2.0</version>
3737
</dependency>
3838
</dependencies>
3939

‎jersey-servlet-example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<dependency>
9797
<groupId>com.moesif.servlet</groupId>
9898
<artifactId>moesif-servlet</artifactId>
99-
<version>1.7.11</version>
99+
<version>1.8.0</version>
100100
</dependency>
101101

102102
<dependency>

‎moesif-servlet-jakarta/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.moesif.servlet</groupId>
55
<artifactId>moesif-servlet-jakarta</artifactId>
6-
<version>2.1.2</version>
6+
<version>2.2.0</version>
77
<packaging>jar</packaging>
88
<name>moesif-servlet-jakarta</name>
99
<description>Moesif SDK for Java Servlet to log and analyze API calls using Jakarta</description>
@@ -52,7 +52,7 @@
5252
<dependency>
5353
<groupId>com.moesif.api</groupId>
5454
<artifactId>moesifapi</artifactId>
55-
<version>1.7.7</version>
55+
<version>1.8.0</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>org.apache.commons</groupId>

‎moesif-servlet-jakarta/src/test/java/com/moesif/servlet/MoesifServletTests.java‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
import com.moesif.api.models.CampaignModel;
1717
import com.moesif.api.models.CampaignBuilder;
1818
import static org.mockito.Mockito.when;
19+
import com.moesif.api.models.SubscriptionBuilder;
20+
import com.moesif.api.models.SubscriptionModel;
1921

2022

2123
public class MoesifServletTests extends TestCase {
@@ -241,5 +243,67 @@ public void testUpdateCompaniesBatch() throws Throwable {
241243
filter.updateCompaniesBatch(companies);
242244
}
243245

246+
public void testUpdateSubscription() throws Throwable {
247+
248+
// Only subscriptionId is required
249+
// metadata can be any custom object
250+
SubscriptionModel subscription = new SubscriptionBuilder()
251+
.subscriptionId("sub_12345")
252+
.companyId("67890")
253+
.currentPeriodStart(new Date())
254+
.currentPeriodEnd(new Date())
255+
.status("active")
256+
.metadata(APIHelper.deserialize("{" +
257+
"\"email\": \"[email protected]\"," +
258+
"\"string_field\": \"value_1\"," +
259+
"\"number_field\": 0," +
260+
"\"object_field\": {" +
261+
"\"field_1\": \"value_1\"," +
262+
"\"field_2\": \"value_2\"" +
263+
"}" +
264+
"}"))
265+
.build();
266+
267+
filter.updateSubscription(subscription);
268+
}
269+
270+
public void testUpdateSubscriptionsBatch() throws Throwable {
271+
272+
List<SubscriptionModel> subscriptions = new ArrayList<SubscriptionModel>();
273+
274+
HashMap<String, Object> metadata = new HashMap<String, Object>();
275+
metadata = APIHelper.deserialize("{" +
276+
"\"email\": \"[email protected]\"," +
277+
"\"string_field\": \"value_1\"," +
278+
"\"number_field\": 0," +
279+
"\"object_field\": {" +
280+
"\"field_1\": \"value_1\"," +
281+
"\"field_2\": \"value_2\"" +
282+
"}" +
283+
"}");
284+
285+
SubscriptionModel subscriptionA = new SubscriptionBuilder()
286+
.subscriptionId("sub_12345")
287+
.companyId("67890")
288+
.currentPeriodStart(new Date())
289+
.currentPeriodEnd(new Date())
290+
.status("active")
291+
.metadata(metadata)
292+
.build();
293+
294+
SubscriptionModel subscriptionB = new SubscriptionBuilder()
295+
.subscriptionId("sub_67890")
296+
.companyId("12345")
297+
.currentPeriodStart(new Date())
298+
.currentPeriodEnd(new Date())
299+
.status("active")
300+
.metadata(metadata)
301+
.build();
302+
303+
subscriptions.add(subscriptionA);
304+
subscriptions.add(subscriptionB);
305+
306+
filter.updateSubscriptionsBatch(subscriptions);
307+
}
244308

245309
}

‎moesif-servlet/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.moesif.servlet</groupId>
55
<artifactId>moesif-servlet</artifactId>
6-
<version>1.7.11</version>
6+
<version>1.8.0</version>
77
<packaging>jar</packaging>
88
<name>moesif-servlet</name>
99
<description>Moesif SDK for Java Servlet to log and analyze API calls</description>
@@ -57,7 +57,7 @@
5757
<dependency>
5858
<groupId>com.moesif.api</groupId>
5959
<artifactId>moesifapi</artifactId>
60-
<version>1.7.7</version>
60+
<version>1.8.0</version>
6161
</dependency>
6262
<dependency>
6363
<groupId>org.apache.commons</groupId>

‎moesif-springrequest/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.moesif.springrequest</groupId>
55
<artifactId>moesif-springrequest</artifactId>
6-
<version>1.1.2</version>
6+
<version>1.2.0</version>
77
<packaging>jar</packaging>
88
<name>moesif-springrequest</name>
99
<description>Moesif SDK for Java to log and analyze outgoing API calls</description>
@@ -55,7 +55,7 @@
5555
<dependency>
5656
<groupId>com.moesif.api</groupId>
5757
<artifactId>moesifapi</artifactId>
58-
<version>1.7.7</version>
58+
<version>1.8.0</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>org.springframework</groupId>

‎servlet-example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>com.moesif.servlet</groupId>
3030
<artifactId>moesif-servlet</artifactId>
31-
<version>1.7.11</version>
31+
<version>1.8.0</version>
3232
</dependency>
3333
</dependencies>
3434

‎spark-servlet-example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<dependency>
7777
<groupId>com.moesif.servlet</groupId>
7878
<artifactId>moesif-servlet</artifactId>
79-
<version>1.7.11</version>
79+
<version>1.8.0</version>
8080
</dependency>
8181
<!--
8282
<dependency>

‎spring-boot-servlet-example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>com.moesif.servlet</groupId>
4444
<artifactId>moesif-servlet</artifactId>
45-
<version>1.7.11</version>
45+
<version>1.8.0</version>
4646
</dependency>
4747

4848

‎spring-boot-starter-example/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.moesif.servlet</groupId>
3333
<artifactId>moesif-servlet</artifactId>
34-
<version>1.7.11</version>
34+
<version>1.8.0</version>
3535
</dependency>
3636
</dependencies>
3737

0 commit comments

Comments
 (0)