Skip to content

Commit 30315e7

Browse files
committed
Merge remote-tracking branch 'upstream/master' into data-bus
* upstream/master: (67 commits) Set version for next development iteration Reached milestone 1.15.0 iluwatar#539 Checkstyle fix iluwatar#539 More Checkstyle fixes iluwatar#539 Checkstyle fixes iluwatar#497 Add missing puml and license headers iluwatar#77 Add missing license header Work on iluwatar#190: urm/puml updates * added pumlid where it was missing and possible * removed pumlid where it generated a bad image * regenerated some incorrect puml's * added 'left to right direction' puml prefix to some diagrams to improve the automatic layouting Removed AvoidStarImport Rule Added JavaDocType Rule Update App.java Update App.java Update after changes from review. Additional improvements. Pom.xml files fixed. iluwatar#66 Balking Pattern fixed pmd violation fixed checkstyle violations diagrams added comments, tests and description changed parent POM version iluwatar#69 apply changes from review iluwatar#69 ... # Conflicts: # pom.xml
2 parents 6b795e5 + 073d06c commit 30315e7

File tree

258 files changed

+3078
-442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

258 files changed

+3078
-442
lines changed

abstract-document/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<artifactId>java-design-patterns</artifactId>
3131
<groupId>com.iluwatar</groupId>
32-
<version>1.15.0-SNAPSHOT</version>
32+
<version>1.16.0-SNAPSHOT</version>
3333
</parent>
3434
<artifactId>abstract-document</artifactId>
3535
<dependencies>

abstract-factory/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<groupId>com.iluwatar</groupId>
3131
<artifactId>java-design-patterns</artifactId>
32-
<version>1.15.0-SNAPSHOT</version>
32+
<version>1.16.0-SNAPSHOT</version>
3333
</parent>
3434
<artifactId>abstract-factory</artifactId>
3535
<dependencies>

abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
import org.junit.Before;
2929
import org.junit.Test;
3030

31+
/**
32+
* Test for abstract factory
33+
*/
3134
public class AbstractFactoryTest {
3235

3336
private App app = new App();

adapter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<groupId>com.iluwatar</groupId>
3131
<artifactId>java-design-patterns</artifactId>
32-
<version>1.15.0-SNAPSHOT</version>
32+
<version>1.16.0-SNAPSHOT</version>
3333
</parent>
3434
<artifactId>adapter</artifactId>
3535
<dependencies>

aggregator-microservices/aggregator-service/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<artifactId>aggregator-microservices</artifactId>
3131
<groupId>com.iluwatar</groupId>
32-
<version>1.15.0-SNAPSHOT</version>
32+
<version>1.16.0-SNAPSHOT</version>
3333
</parent>
3434
<modelVersion>4.0.0</modelVersion>
3535

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/App.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
import org.springframework.boot.SpringApplication;
2626
import org.springframework.boot.autoconfigure.SpringBootApplication;
2727

28+
/**
29+
* Spring Boot EntryPoint Class
30+
*/
2831
@SpringBootApplication
2932
public class App {
3033

aggregator-microservices/aggregator-service/src/test/java/com/iluwatar/aggregator/microservices/AggregatorTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,18 @@
2222
*/
2323
package com.iluwatar.aggregator.microservices;
2424

25+
import static org.junit.Assert.assertEquals;
26+
import static org.mockito.Mockito.when;
27+
2528
import org.junit.Before;
2629
import org.junit.Test;
2730
import org.mockito.InjectMocks;
2831
import org.mockito.Mock;
2932
import org.mockito.MockitoAnnotations;
3033

31-
import static org.junit.Assert.assertEquals;
32-
import static org.mockito.Mockito.when;
33-
34+
/**
35+
* Test Aggregation of domain objects
36+
*/
3437
public class AggregatorTest {
3538

3639
@InjectMocks
@@ -64,4 +67,4 @@ public void testGetProduct() {
6467
assertEquals(inventories, testProduct.getProductInventories());
6568
}
6669

67-
}
70+
}

aggregator-microservices/information-microservice/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<parent>
3030
<artifactId>aggregator-microservices</artifactId>
3131
<groupId>com.iluwatar</groupId>
32-
<version>1.15.0-SNAPSHOT</version>
32+
<version>1.16.0-SNAPSHOT</version>
3333
</parent>
3434
<modelVersion>4.0.0</modelVersion>
3535

aggregator-microservices/information-microservice/src/main/java/com/iluwatar/information/microservice/InformationController.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
import org.springframework.web.bind.annotation.RequestMethod;
2727
import org.springframework.web.bind.annotation.RestController;
2828

29+
/**
30+
* Controller providing endpoints to retrieve information about products
31+
*/
2932
@RestController
3033
public class InformationController {
3134

aggregator-microservices/information-microservice/src/test/java/com/iluwatar/information/microservice/InformationControllerTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
import org.junit.Assert;
2626
import org.junit.Test;
2727

28+
/**
29+
* Test for Information Rest Controller
30+
*/
2831
public class InformationControllerTest {
2932

3033
@Test
@@ -36,4 +39,4 @@ public void shouldGetProductTitle() {
3639
Assert.assertEquals("The Product Title.", title);
3740
}
3841

39-
}
42+
}

0 commit comments

Comments
 (0)