BAEL-3486 (eugenp#8458)

mguarnaccia · maibin · commit 314008498657 · 2020-01-02T11:27:18.000-08:00
* Hexagonal architecture: a quick and practical example

* BAEL-3486


commit

* Formatting issue solved

* Update code for consistency with article
diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/GreedyAlgorithm.java
@@ -15,7 +15,7 @@ public GreedyAlgorithm(SocialConnector sc) {
         this.fp = new FollowersPath();
     }
     
-    public long findMostFollowersPath(String account) throws Exception {        
+    public long findMostFollowersPath(String account) {
         long max = 0;
         SocialUser toFollow = null;
         
@@ -31,12 +31,8 @@ public long findMostFollowersPath(String account) throws Exception {
         if (currentLevel < maxLevel - 1) {
             currentLevel++;
             max += findMostFollowersPath(toFollow.getUsername());
-            //fp.addFollower(toFollow.getUsername(), max);
-            //fp.addCount(max);
             return max;
         } else {
-            //fp.addFollower(toFollow.getUsername(), max);
-            //fp.addCount(max);
             return max;
         }            
     }
diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/NonGreedyAlgorithm.java
@@ -13,9 +13,8 @@ public NonGreedyAlgorithm(SocialConnector tc, int level) {
         this.tc = tc;
         this.currentLevel = level;
     }
-    
-    
-    public long findMostFollowersPath(String account) throws Exception {        
+      
+    public long findMostFollowersPath(String account) {
         List<SocialUser> followers = tc.getFollowers(account);
         long total = currentLevel > 0 ? followers.size() : 0;
 
diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/greedy/SocialConnector.java
@@ -20,9 +20,9 @@ public boolean switchCounter() {
         return this.isCounterEnabled;
     }
     
-    public List<SocialUser> getFollowers(String account) throws Exception {
+    public List<SocialUser> getFollowers(String account) {
         if (counter < 0)
-            throw new Exception ("API limit reached");
+            throw new IllegalStateException ("API limit reached");
         else {
             if(this.isCounterEnabled) counter--;
             for(SocialUser user : users) {
diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/greedy/GreedyAlgorithmUnitTest.java
@@ -35,21 +35,21 @@ private SocialConnector prepareNetwork() {
     }
 
     @Test
-    public void greedyAlgorithmTest() throws Exception {
+    public void greedyAlgorithmTest() {
         GreedyAlgorithm ga = new GreedyAlgorithm(prepareNetwork());
         assertEquals(ga.findMostFollowersPath("root"), 5);
     }
 
     @Test
-    public void nongreedyAlgorithmTest() throws Exception {
+    public void nongreedyAlgorithmTest() {
         NonGreedyAlgorithm nga = new NonGreedyAlgorithm(prepareNetwork(), 0);
-        Assertions.assertThrows(Exception.class, () -> {
+        Assertions.assertThrows(IllegalStateException.class, () -> {
             nga.findMostFollowersPath("root");
           });
     }
 
     @Test
-    public void nongreedyAlgorithmUnboundedTest() throws Exception {
+    public void nongreedyAlgorithmUnboundedTest() {
         SocialConnector sc = prepareNetwork();
         sc.switchCounter();
         NonGreedyAlgorithm nga = new NonGreedyAlgorithm(sc, 0);

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public GreedyAlgorithm(SocialConnector sc) {`
`15`	`15`	`this.fp = new FollowersPath();`
`16`	`16`	`}`
`17`	`17`
`18`		`- public long findMostFollowersPath(String account) throws Exception {`
	`18`	`+ public long findMostFollowersPath(String account) {`
`19`	`19`	`long max = 0;`
`20`	`20`	`SocialUser toFollow = null;`
`21`	`21`
`@@ -31,12 +31,8 @@ public long findMostFollowersPath(String account) throws Exception {`
`31`	`31`	`if (currentLevel < maxLevel - 1) {`
`32`	`32`	`currentLevel++;`
`33`	`33`	`max += findMostFollowersPath(toFollow.getUsername());`
`34`		`- //fp.addFollower(toFollow.getUsername(), max);`
`35`		`- //fp.addCount(max);`
`36`	`34`	`return max;`
`37`	`35`	`} else {`
`38`		`- //fp.addFollower(toFollow.getUsername(), max);`
`39`		`- //fp.addCount(max);`
`40`	`36`	`return max;`
`41`	`37`	`}`
`42`	`38`	`}`