Skip to content

Pull master from Source Repo #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 7, 2019
Merged

Pull master from Source Repo #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60171e3
Fix for Issue #549 : Update Exception Handling Code in Aggregator Mic…
jarpit96 Oct 6, 2019
94ca254
Fix for issue #954 : Add external Dependencies to run with Java11 (#957)
jarpit96 Oct 6, 2019
2b1c09a
Fix link in Acyclic Visitor
iluwatar Oct 7, 2019
f5455f9
update buggy dependencies (#968)
Scuilion Oct 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions acyclic-visitor/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ The bad:
* Parallel hierarchy of visitors has to be created for all members in visitable class hierarchy.

## Related patterns
* [Visitor Pattern](../visitor/README.md)
* [Visitor Pattern](../visitor/)

## Credits
* [Acyclic Visitor](http://condor.depaul.edu/dmumaugh/OOT/Design-Principles/acv.pdf)
* [Acyclic Visitor](http://condor.depaul.edu/dmumaugh/OOT/Design-Principles/acv.pdf)
7 changes: 5 additions & 2 deletions ...ice/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
*/
package com.iluwatar.aggregator.microservices;

import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
Expand Down Expand Up @@ -49,8 +50,10 @@ public String getProductTitle() {
try (CloseableHttpResponse httpResponse = httpClient.execute(httpGet)) {
response = EntityUtils.toString(httpResponse.getEntity());
}
} catch (IOException e) {
LOGGER.error("Exception caught.", e);
} catch (ClientProtocolException cpe) {
LOGGER.error("ClientProtocolException Occured", cpe);
} catch (IOException ioe) {
LOGGER.error("IOException Occurred", ioe);
}
return response;
}
Expand Down
7 changes: 5 additions & 2 deletions ...rvice/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
*/
package com.iluwatar.aggregator.microservices;

import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
Expand Down Expand Up @@ -49,8 +50,10 @@ public int getProductInventories() {
try (CloseableHttpResponse httpResponse = httpClient.execute(httpGet)) {
response = EntityUtils.toString(httpResponse.getEntity());
}
} catch (IOException e) {
LOGGER.error("Exception caught.", e);
} catch (ClientProtocolException cpe) {
LOGGER.error("ClientProtocolException Occured", cpe);
} catch (IOException ioe) {
LOGGER.error("IOException Occurred", ioe);
}
return Integer.parseInt(response);
}
Expand Down
18 changes: 15 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,20 @@
<camel.version>2.16.1</camel.version>
<guava.version>19.0</guava.version>
<mockito.version>1.10.19</mockito.version>
<apache-httpcomponents.version>4.5.2</apache-httpcomponents.version>
<apache-httpcomponents.version>4.5.10</apache-httpcomponents.version>
<htmlunit.version>2.22</htmlunit.version>
<guice.version>4.0</guice.version>
<mongo-java-driver.version>3.3.0</mongo-java-driver.version>
<slf4j.version>1.7.21</slf4j.version>
<logback.version>1.1.7</logback.version>
<slf4j.version>1.7.28</slf4j.version>
<logback.version>1.2.3</logback.version>
<aws-lambda-core.version>1.1.0</aws-lambda-core.version>
<aws-java-sdk-dynamodb.version>1.11.289</aws-java-sdk-dynamodb.version>
<aws-lambda-log4j.version>1.0.0</aws-lambda-log4j.version>
<aws-lambda-java-events.version>2.0.1</aws-lambda-java-events.version>
<jackson.version>2.8.5</jackson.version>
<pmd.version>3.12.0</pmd.version>
<jaxb-api.version>2.3.0</jaxb-api.version>
<annotation-api.version>1.3.1</annotation-api.version>
</properties>
<modules>
<module>abstract-factory</module>
Expand Down Expand Up @@ -298,6 +300,16 @@
<artifactId>mongo-java-driver</artifactId>
<version>${mongo-java-driver.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${annotation-api.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
8 changes: 8 additions & 0 deletions repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,13 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>
</dependencies>
</project>