23 countries non membership displays membership data

src/main/java/org/airpenthouse/GoTel/controllers/AdministratorsController.java

@@ -14,6 +14,7 @@
 
 @RestController
 @RequestMapping("api/administrators")
+@CrossOrigin(origins="http://localhost:4200")
 public class AdministratorsController {
 
 

src/main/java/org/airpenthouse/GoTel/controllers/CitiesController.java

@@ -19,6 +19,7 @@
 
 @RestController
 @RequestMapping("/api/cities")
+@CrossOrigin(origins="http://localhost:4200")
 public class CitiesController {
     @Autowired
     public CitiesMapper citiesMapper;

src/main/java/org/airpenthouse/GoTel/controllers/CountApiUsersController.java

@@ -5,6 +5,7 @@
 import org.airpenthouse.GoTel.util.mappers.CountApiUsersMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -13,6 +14,7 @@
 
 @RestController
 @RequestMapping("api/countApiUsers")
+@CrossOrigin(origins="http://localhost:4200")
 public class CountApiUsersController extends CountApiUsers {
 
     @Autowired

src/main/java/org/airpenthouse/GoTel/controllers/CountriesController.java

@@ -14,6 +14,7 @@
 
 @RequestMapping("/api/countries")
 @RestController
+@CrossOrigin(origins="http://localhost:4200")
 public class CountriesController {
     @Autowired
     public CountriesMapper mapper;

src/main/java/org/airpenthouse/GoTel/controllers/MembershipController.java

@@ -20,6 +20,7 @@
 
 @RestController
 @RequestMapping("/api/membership")
+@CrossOrigin(origins="http://localhost:4200")
 public class MembershipController {
 
     @Autowired

src/main/java/org/airpenthouse/GoTel/controllers/SponsorsController.java

@@ -15,6 +15,7 @@
 
 @RequestMapping("/api/sponsors")
 @RestController
+@CrossOrigin(origins="http://localhost:4200")
 public class SponsorsController {
 
     @Autowired

src/main/java/org/airpenthouse/GoTel/controllers/WorldLanguagesController.java

@@ -19,6 +19,7 @@
 
 @RestController
 @RequestMapping("/api/worldLanguages")
+@CrossOrigin(origins="http://localhost:4200")
 public class WorldLanguagesController {
 
     @Autowired
@@ -27,8 +28,6 @@ public class WorldLanguagesController {
     @Autowired
     public WorldLanguagesService executor;
 
-
-
     @GetMapping("/findAllLanguages")
     public ResponseEntity<Set<LanguageRequest>> getAllLanguages() {
         WorldLanguagesExecutors.setLanguageMapper(mapper);

src/main/java/org/airpenthouse/GoTel/services/country/CountriesService.java

@@ -26,9 +26,9 @@ private Set<? extends CountriesRequestCombiner> getAllCountries() {
 
     private Set<? extends CountriesRequestCombiner> getRequest() {
         if (checkMemberShipStatusAndTokenMatch())
-            return initializeCountriesEntity().stream().map(mapper::mapper).collect(Collectors.toSet());
-        else
             return initializeCountriesEntity().stream().map(mapper::mapToMembershipCountryRequest).collect(Collectors.toSet());
+        else
+            return initializeCountriesEntity().stream().map(mapper::mapper).collect(Collectors.toSet());
     }
 
     private Set<? extends CountriesRequestCombiner> getCountryByName() {

src/main/java/org/airpenthouse/GoTel/util/executors/CountriesExecutors.java

@@ -30,10 +30,10 @@ private ExecutorService determineNoThreadToUse() {
             Members with registered successful uses more threads than non membership
          */
         if (checkMemberShipStatusAndTokenMatch()) {
-            final var noProcesses = Runtime.getRuntime().availableProcessors();
+            final var noProcesses = Runtime.getRuntime().availableProcessors() * 2;
             executeCountries = Executors.newFixedThreadPool(noProcesses);
         } else {
-            final var noProcesses = Runtime.getRuntime().availableProcessors() * 2;
+            final var noProcesses = Runtime.getRuntime().availableProcessors() ;
             executeCountries = Executors.newFixedThreadPool(noProcesses);
         }
         return executeCountries;