Merge pull request #36 from sflpro/#17

#17 ignored tests revisited; some refactoring

api/api-facade/src/main/java/com/sflpro/notifier/api/internal/facade/notification/email/impl/EmailNotificationServiceFacadeImpl.java

@@ -85,21 +85,4 @@ private EmailNotificationModel createEmailNotificationModel(final EmailNotificat
         notificationModel.setRecipientEmail(emailNotification.getRecipientEmail());
         return notificationModel;
     }
-
-    /* Properties getters and setters */
-    public EmailNotificationService getEmailNotificationService() {
-        return emailNotificationService;
-    }
-
-    public void setEmailNotificationService(final EmailNotificationService emailNotificationService) {
-        this.emailNotificationService = emailNotificationService;
-    }
-
-    public ApplicationEventDistributionService getApplicationEventDistributionService() {
-        return applicationEventDistributionService;
-    }
-
-    public void setApplicationEventDistributionService(final ApplicationEventDistributionService applicationEventDistributionService) {
-        this.applicationEventDistributionService = applicationEventDistributionService;
-    }
 }

api/api-facade/src/main/java/com/sflpro/notifier/api/internal/facade/notification/push/impl/PushNotificationServiceFacadeImpl.java

@@ -137,37 +137,4 @@ private static PushNotificationRecipientModel createPushNotificationRecipientMod
         recipientModel.setDeviceOperatingSystemType(recipient.getDeviceOperatingSystemType().name());
         return recipientModel;
     }
-
-    /* Properties getters and setters */
-    public PushNotificationService getPushNotificationService() {
-        return pushNotificationService;
-    }
-
-    public void setPushNotificationService(final PushNotificationService pushNotificationService) {
-        this.pushNotificationService = pushNotificationService;
-    }
-
-    public ApplicationEventDistributionService getApplicationEventDistributionService() {
-        return applicationEventDistributionService;
-    }
-
-    public void setApplicationEventDistributionService(final ApplicationEventDistributionService applicationEventDistributionService) {
-        this.applicationEventDistributionService = applicationEventDistributionService;
-    }
-
-    public UserDeviceService getUserDeviceService() {
-        return userDeviceService;
-    }
-
-    public void setUserDeviceService(final UserDeviceService userDeviceService) {
-        this.userDeviceService = userDeviceService;
-    }
-
-    public PushNotificationSubscriptionRequestService getPushNotificationSubscriptionRequestService() {
-        return pushNotificationSubscriptionRequestService;
-    }
-
-    public void setPushNotificationSubscriptionRequestService(final PushNotificationSubscriptionRequestService pushNotificationSubscriptionRequestService) {
-        this.pushNotificationSubscriptionRequestService = pushNotificationSubscriptionRequestService;
-    }
 }

api/api-facade/src/main/java/com/sflpro/notifier/api/internal/facade/notification/sms/impl/SmsNotificationServiceFacadeImpl.java

@@ -76,21 +76,4 @@ private SmsNotificationModel createSmsNotificationModel(final SmsNotification sm
         notificationModel.setRecipientNumber(smsNotification.getRecipientMobileNumber());
         return notificationModel;
     }
-
-    /* Properties getters and setters */
-    public SmsNotificationService getSmsNotificationService() {
-        return smsNotificationService;
-    }
-
-    public void setSmsNotificationService(final SmsNotificationService smsNotificationService) {
-        this.smsNotificationService = smsNotificationService;
-    }
-
-    public ApplicationEventDistributionService getApplicationEventDistributionService() {
-        return applicationEventDistributionService;
-    }
-
-    public void setApplicationEventDistributionService(final ApplicationEventDistributionService applicationEventDistributionService) {
-        this.applicationEventDistributionService = applicationEventDistributionService;
-    }
 }

core/core-db-entities/src/main/java/com/sflpro/notifier/db/entities/notification/NotificationProviderType.java

@@ -17,7 +17,7 @@ public enum NotificationProviderType {
     /* Properties */
     private final List<NotificationType> supportedNotificationTypes;
 
-    private NotificationProviderType(final NotificationType... notificationTypes) {
+    NotificationProviderType(final NotificationType... notificationTypes) {
         this.supportedNotificationTypes = Collections.unmodifiableList(Arrays.asList(notificationTypes));
     }
 

core/core-services-impl/src/test/java/com/sflpro/notifier/services/notification/NotificationProcessingServiceIntegrationTest.java

@@ -18,7 +18,6 @@
  * Date: 8/24/15
  * Time: 1:40 PM
  */
-@Ignore
 public class NotificationProcessingServiceIntegrationTest extends AbstractServiceIntegrationTest {
 
     /* Dependencies */
@@ -33,6 +32,7 @@ public NotificationProcessingServiceIntegrationTest() {
     }
 
     /* Test methods */
+    @Ignore
     @Test
     public void testProcessNotificationWithPushNotification() {
         // Prepare data

core/core-services-impl/src/test/java/com/sflpro/notifier/services/notification/impl/email/EmailNotificationProcessorImplTest.java

@@ -1,24 +1,19 @@
 package com.sflpro.notifier.services.notification.impl.email;
 
-import com.microtripit.mandrillapp.lutung.controller.MandrillMessagesApi;
 import com.sflpro.notifier.db.entities.notification.NotificationProviderType;
 import com.sflpro.notifier.db.entities.notification.NotificationState;
 import com.sflpro.notifier.db.entities.notification.email.EmailNotification;
 import com.sflpro.notifier.db.repositories.utility.PersistenceUtilityService;
 import com.sflpro.notifier.services.common.exception.ServicesRuntimeException;
-import com.sflpro.notifier.services.notification.dto.email.MailSendConfiguration;
 import com.sflpro.notifier.services.notification.email.EmailNotificationService;
-import com.sflpro.notifier.services.notification.email.SmtpTransportService;
 import com.sflpro.notifier.services.notification.impl.email.mandrill.EmailNotificationMandrillProviderProcessor;
 import com.sflpro.notifier.services.notification.impl.email.smtp.EmailNotificationSmtpProviderProcessor;
 import com.sflpro.notifier.services.test.AbstractServicesUnitTest;
 import org.easymock.Mock;
 import org.easymock.TestSubject;
-import org.junit.Assert;
 import org.junit.Test;
 
 import static org.easymock.EasyMock.*;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 /**
@@ -122,8 +117,6 @@ public void testProcessNotificationForWhenProviderTypeIsSmtpAndSuccess() {
         verifyAll();
     }
 
-
-
     @Test
     public void testProcessNotificationForWhenProviderTypeIsMandrillAndFail() {
         // Test data

infra/infra-integrations/infra-integrations-sms/src/test/java/com/sflpro/notifier/externalclients/sms/twillio/TwillioApiCommunicatorIntegrationTest.java

@@ -6,7 +6,6 @@
 import com.sflpro.notifier.externalclients.sms.twillio.model.request.SendMessageRequest;
 import com.sflpro.notifier.externalclients.sms.twillio.model.response.SendMessageResponse;
 import org.apache.commons.lang3.StringUtils;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -18,7 +17,6 @@
  * Date: 3/15/15
  * Time: 11:03 AM
  */
-@Ignore
 public class TwillioApiCommunicatorIntegrationTest extends AbstractSmsIntegrationTest {
 
     /* Constants */
@@ -88,7 +86,7 @@ private void assertSendMessageRequestResponse(final SendMessageRequest request,
         assertNotNull(response);
         assertTrue(StringUtils.isNotEmpty(response.getSid()));
         assertEquals(request.getRecipientNumber(), response.getRecipientNumber());
-        assertEquals(request.getMessageBody(), response.getMessageBody());
+        assertEquals("Sent from your Twilio trial account - " + request.getMessageBody(), response.getMessageBody());
     }
 
     private SendMessageRequest createValidSendMessageRequest() {

infra/infra-queue/infra-queue-consumer/src/main/resources/applicationContext-queue-consumer-services.xml

@@ -4,11 +4,8 @@
        xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans.xsd
-
-
            http://www.springframework.org/schema/context
            http://www.springframework.org/schema/context/spring-context.xsd"
-
        default-lazy-init="true" default-autowire="byName">
 
     <context:annotation-config />