Skip to content

Commit

Permalink
Merge pull request #54 from Moesif/update-moesifapijava-v1013
Browse files Browse the repository at this point in the history
Upgrading moesifapi-java to v1.6.13 moesif-servlet v1.6.12 moesif-springrequest v1.0.11
  • Loading branch information
dkm199 authored May 27, 2021
2 parents 323f566 + a971e98 commit 83fb342
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 32 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Add the Moesif dependency to your project's pom.xml file:
<dependency>
<groupId>com.moesif.servlet</groupId>
<artifactId>moesif-servlet</artifactId>
<version>1.6.11</version>
<version>1.6.12</version>
</dependency>
```

Expand All @@ -35,7 +35,7 @@ Add the Moesif dependency to your project's build.gradle file:

```gradle
dependencies {
compile 'com.moesif.servlet:moesif-servlet:1.6.11'
compile 'com.moesif.servlet:moesif-servlet:1.6.12'
}
```

Expand Down
6 changes: 3 additions & 3 deletions jersey-servlet-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>com.moesif.servlet.jersey</groupId>
<artifactId>jersey-servlet-example</artifactId>
<packaging>war</packaging>
<version>1.2.1</version>
<version>1.2.2</version>
<name>jersey-servlet-example</name>

<build>
Expand All @@ -15,7 +15,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>3.8.1</version>
<inherited>true</inherited>
<configuration>
<source>1.7</source>
Expand Down Expand Up @@ -66,7 +66,7 @@
<dependency>
<groupId>com.moesif.servlet</groupId>
<artifactId>moesif-servlet</artifactId>
<version>1.6.11</version>
<version>1.6.12</version>
</dependency>
</dependencies>
<properties>
Expand Down
8 changes: 4 additions & 4 deletions moesif-servlet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.moesif.servlet</groupId>
<artifactId>moesif-servlet</artifactId>
<version>1.6.11</version>
<version>1.6.12</version>
<packaging>jar</packaging>
<name>moesif-servlet</name>
<description>Moesif SDK for Java Servlet to log and analyze API calls</description>
Expand Down Expand Up @@ -45,7 +45,7 @@
<commons-io.version>2.4</commons-io.version>
<commons-lang3.version>3.4</commons-lang3.version>
<jackson.version>2.8.7</jackson.version>
<junit.version>4.12</junit.version>
<junit.version>4.13.2</junit.version>
<logback.version>1.1.3</logback.version>
<mockito-core.version>1.10.19</mockito-core.version>
<java.version>1.7</java.version>
Expand All @@ -61,12 +61,12 @@
<dependency>
<groupId>com.moesif.api</groupId>
<artifactId>moesifapi</artifactId>
<version>1.6.12</version>
<version>1.6.13</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.10.1</version>
<version>2.9.10.8</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.moesif.servlet;

import java.io.IOException;
import java.io.InputStream;
import java.util.*;
import java.util.logging.Logger;
import java.lang.*;
import com.fasterxml.jackson.databind.ObjectMapper;

import javax.servlet.Filter;
import javax.servlet.FilterChain;
Expand Down Expand Up @@ -190,8 +190,9 @@ public void getAndUpdateAppConfig() {
String responseConfigEtag = configApiResponse.getHeaders().get("x-moesif-config-etag");

// Read the response body
ObjectMapper mapper = new ObjectMapper();
AppConfigModel newConfig = mapper.readValue(configApiResponse.getRawBody(), AppConfigModel.class);
InputStream respBodyIs = configApiResponse.getRawBody();
AppConfigModel newConfig = APIController.parseAppConfigModel(respBodyIs);
respBodyIs.close();

this.appConfigModel = newConfig;
this.cachedConfigEtag = responseConfigEtag;
Expand Down
4 changes: 2 additions & 2 deletions moesif-springrequest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Add the Moesif dependency to your project's pom.xml file:
<dependency>
<groupId>com.moesif.springrequest</groupId>
<artifactId>moesif-springrequest</artifactId>
<version>1.0.10</version>
<version>1.0.11</version>
</dependency>
```

Expand All @@ -28,7 +28,7 @@ Add the Moesif dependency to your project's build.gradle file:

```gradle
dependencies {
compile 'com.moesif.springrequest:moesif-springrequest:1.0.10'
compile 'com.moesif.springrequest:moesif-springrequest:1.0.11'
}
```

Expand Down
6 changes: 3 additions & 3 deletions moesif-springrequest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.moesif.springrequest</groupId>
<artifactId>moesif-springrequest</artifactId>
<version>1.0.10</version>
<version>1.0.11</version>
<packaging>jar</packaging>
<name>moesif-springrequest</name>
<description>Moesif SDK for Java to log and analyze outgoing API calls</description>
Expand Down Expand Up @@ -45,7 +45,7 @@
<commons-io.version>2.4</commons-io.version>
<commons-lang3.version>3.4</commons-lang3.version>
<jackson.version>2.8.7</jackson.version>
<junit.version>4.12</junit.version>
<junit.version>4.13.2</junit.version>
<logback.version>1.1.3</logback.version>
<mockito-core.version>1.10.19</mockito-core.version>
<java.version>1.7</java.version>
Expand All @@ -56,7 +56,7 @@
<dependency>
<groupId>com.moesif.api</groupId>
<artifactId>moesifapi</artifactId>
<version>1.6.12</version>
<version>1.6.13</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Expand Down
4 changes: 2 additions & 2 deletions servlet-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.moesif.servlet</groupId>
<artifactId>servlet-example</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<packaging>war</packaging>
<name>servlet-example</name>

Expand All @@ -28,7 +28,7 @@
<dependency>
<groupId>com.moesif.servlet</groupId>
<artifactId>moesif-servlet</artifactId>
<version>1.6.11</version>
<version>1.6.12</version>
</dependency>
</dependencies>

Expand Down
6 changes: 3 additions & 3 deletions spark-servlet-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<groupId>com.moesif.servlet.spark</groupId>
<artifactId>spark-servlet-example</artifactId>
<packaging>war</packaging>
<version>1.1.1</version>
<version>1.1.2</version>
<name>spark-servlet-example</name>

<build>
Expand All @@ -15,7 +15,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<version>3.8.1</version>
<inherited>true</inherited>
<configuration>
<source>1.8</source>
Expand Down Expand Up @@ -52,7 +52,7 @@
<dependency>
<groupId>com.moesif.servlet</groupId>
<artifactId>moesif-servlet</artifactId>
<version>1.6.11</version>
<version>1.6.12</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down
8 changes: 4 additions & 4 deletions spring-boot-servlet-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>spring-boot-servlet-example</artifactId>
<name>spring-boot-servlet-example</name>
<packaging>war</packaging>
<version>1.3.1</version>
<version>1.3.2</version>

<properties>
<springframework.version>5.2.9.RELEASE</springframework.version>
Expand Down Expand Up @@ -38,13 +38,13 @@
<dependency>
<groupId>com.moesif.springrequest</groupId>
<artifactId>moesif-springrequest</artifactId>
<version>1.0.10</version>
<version>1.0.11</version>
</dependency>

<dependency>
<groupId>com.moesif.servlet</groupId>
<artifactId>moesif-servlet</artifactId>
<version>1.6.11</version>
<version>1.6.12</version>
</dependency>


Expand Down Expand Up @@ -94,7 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand Down
4 changes: 2 additions & 2 deletions spring-boot-starter-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>spring-boot-starter-example</artifactId>
<name>spring-boot-starter-example</name>
<packaging>war</packaging>
<version>1.3.1</version>
<version>1.3.2</version>

<parent>
<groupId>org.springframework.boot</groupId>
Expand All @@ -31,7 +31,7 @@
<dependency>
<groupId>com.moesif.servlet</groupId>
<artifactId>moesif-servlet</artifactId>
<version>1.6.11</version>
<version>1.6.12</version>
</dependency>
</dependencies>

Expand Down
8 changes: 4 additions & 4 deletions springrequest-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</parent>
<groupId>com.moesif.springrequestexample</groupId>
<artifactId>springrequest-example</artifactId>
<version>1.3.0</version>
<version>1.3.1</version>
<name>springrequest-example</name>
<url>http://maven.apache.org</url>

Expand All @@ -19,7 +19,7 @@
<commons-io.version>2.4</commons-io.version>
<commons-lang3.version>3.4</commons-lang3.version>
<jackson.version>2.8.7</jackson.version>
<junit.version>4.12</junit.version>
<junit.version>4.13.2</junit.version>
<logback.version>1.1.3</logback.version>
<mockito-core.version>1.10.19</mockito-core.version>
</properties>
Expand All @@ -43,12 +43,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.9.8</version>
<version>2.9.10</version>
</dependency>
<dependency>
<groupId>com.moesif.springrequest</groupId>
<artifactId>moesif-springrequest</artifactId>
<version>1.0.10</version>
<version>1.0.11</version>
</dependency>

<dependency>
Expand Down

0 comments on commit 83fb342

Please sign in to comment.