Browse Source

add file headers, add .file_header_ignore

tags/v1.3.2
Jonathan Cobb 4 years ago
parent
commit
6a5782eebe
16 changed files with 51 additions and 13 deletions
  1. +1
    -10
      bubble-server/src/main/java/bubble/cloud/email/SmtpEmailDriver.java
  2. +8
    -1
      bubble-server/src/main/java/bubble/cloud/email/sendgrid/SendgridSmtpEmailDriver.java
  3. +4
    -0
      bubble-server/src/main/java/bubble/dao/device/HasDeviceDAO.java
  4. +4
    -0
      bubble-server/src/main/java/bubble/model/device/FlexRouterRemoveRoutes.java
  5. +4
    -0
      bubble-server/src/main/java/bubble/resources/device/DeviceTypesResource.java
  6. +4
    -0
      bubble-server/src/main/java/bubble/service/stream/StreamConstants.java
  7. +4
    -0
      bubble-server/src/main/java/bubble/service/stream/charset/BubbleCharSet.java
  8. +4
    -0
      bubble-server/src/main/java/bubble/service/stream/charset/CharsetDetector.java
  9. +4
    -0
      bubble-server/src/main/java/bubble/service/stream/charset/HtmlCharsetDetector.java
  10. +4
    -0
      bubble-server/src/main/java/bubble/service/stream/charset/HtmlStreamCharsetDetector.java
  11. +4
    -0
      bubble-server/src/test/java/bubble/test/filter/CharsetDetectionTest.java
  12. +4
    -0
      bubble-server/src/test/java/bubble/test/filter/PassthruDriver.java
  13. +0
    -0
     
  14. +0
    -0
     
  15. +1
    -1
      bubble-web
  16. +1
    -1
      utils/cobbzilla-utils

+ 1
- 10
bubble-server/src/main/java/bubble/cloud/email/SmtpEmailDriver.java View File

@@ -17,16 +17,10 @@ import lombok.extern.slf4j.Slf4j;
import org.cobbzilla.mail.sender.SmtpMailSender; import org.cobbzilla.mail.sender.SmtpMailSender;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;


import java.util.ArrayList;
import java.util.List;

import static org.cobbzilla.util.daemon.ZillaRuntime.die; import static org.cobbzilla.util.daemon.ZillaRuntime.die;


@Slf4j @Slf4j
public class SmtpEmailDriver extends CloudServiceDriverBase<EmailDriverConfig> implements EmailServiceDriver { public class SmtpEmailDriver extends CloudServiceDriverBase<EmailDriverConfig> implements EmailServiceDriver {
protected static final String SENDGRID_SMTP = "smtp.sendgrid.net";

private static final List<String> SEPARATE_DRIVERS_SMTPS = new ArrayList<>();


protected static final String PARAM_USER = "user"; protected static final String PARAM_USER = "user";
protected static final String PARAM_PASSWORD = "password"; protected static final String PARAM_PASSWORD = "password";
@@ -54,10 +48,7 @@ public class SmtpEmailDriver extends CloudServiceDriverBase<EmailDriverConfig> i
} }
} }


protected boolean isServiceCompatible(final String serviceHost) {
// Allow even Sendgrid here if Subusers are not supported for specified API key
return !SEPARATE_DRIVERS_SMTPS.contains(serviceHost);
}
protected boolean isServiceCompatible(final String serviceHost) { return true; }


@Override public boolean send(Account account, AccountMessage message, AccountContact contact) { @Override public boolean send(Account account, AccountMessage message, AccountContact contact) {
return EmailServiceDriver.send(this, account, message, contact); return EmailServiceDriver.send(this, account, message, contact);


bubble-server/src/main/java/bubble/cloud/email/SendgridSmtpEmailDriver.java → bubble-server/src/main/java/bubble/cloud/email/sendgrid/SendgridSmtpEmailDriver.java View File

@@ -1,5 +1,10 @@
package bubble.cloud.email;
/**
* Copyright (c) 2020 Bubble, Inc. All rights reserved.
* For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
*/
package bubble.cloud.email.sendgrid;


import bubble.cloud.email.SmtpEmailDriver;
import bubble.dao.account.AccountDAO; import bubble.dao.account.AccountDAO;
import bubble.dao.cloud.CloudServiceDAO; import bubble.dao.cloud.CloudServiceDAO;
import bubble.model.account.Account; import bubble.model.account.Account;
@@ -31,6 +36,8 @@ import static org.cobbzilla.wizard.model.IdentifiableBase.DEFAULT_SHORT_ID_LENGT
* Only to be used with Sendgrid account with Subusers supported! * Only to be used with Sendgrid account with Subusers supported!
*/ */
public class SendgridSmtpEmailDriver extends SmtpEmailDriver { public class SendgridSmtpEmailDriver extends SmtpEmailDriver {

public static final String SENDGRID_SMTP = "smtp.sendgrid.net";
public static final String SG_API_BASE = "https://api.sendgrid.com/v3/"; public static final String SG_API_BASE = "https://api.sendgrid.com/v3/";


private static final String PARAM_PARENT_SERVICE = "parentService"; private static final String PARAM_PARENT_SERVICE = "parentService";

+ 4
- 0
bubble-server/src/main/java/bubble/dao/device/HasDeviceDAO.java View File

@@ -1,3 +1,7 @@
/**
* Copyright (c) 2020 Bubble, Inc. All rights reserved.
* For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
*/
package bubble.dao.device; package bubble.dao.device;


public interface HasDeviceDAO { public interface HasDeviceDAO {


+ 4
- 0
bubble-server/src/main/java/bubble/model/device/FlexRouterRemoveRoutes.java View File

@@ -1,3 +1,7 @@
/**
* Copyright (c) 2020 Bubble, Inc. All rights reserved.
* For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
*/
package bubble.model.device; package bubble.model.device;


import lombok.Getter; import lombok.Getter;


+ 4
- 0
bubble-server/src/main/java/bubble/resources/device/DeviceTypesResource.java View File

@@ -1,3 +1,7 @@
/**
* Copyright (c) 2020 Bubble, Inc. All rights reserved.
* For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
*/
package bubble.resources.device; package bubble.resources.device;


import bubble.model.account.Account; import bubble.model.account.Account;


+ 4
- 0
bubble-server/src/main/java/bubble/service/stream/StreamConstants.java View File

@@ -1,3 +1,7 @@
/**
* Copyright (c) 2020 Bubble, Inc. All rights reserved.
* For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
*/
package bubble.service.stream; package bubble.service.stream;


import org.cobbzilla.util.system.Bytes; import org.cobbzilla.util.system.Bytes;


+ 4
- 0
bubble-server/src/main/java/bubble/service/stream/charset/BubbleCharSet.java View File

@@ -1,3 +1,7 @@
/**
* Copyright (c) 2020 Bubble, Inc. All rights reserved.
* For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
*/
package bubble.service.stream.charset; package bubble.service.stream.charset;


import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;


+ 4
- 0
bubble-server/src/main/java/bubble/service/stream/charset/CharsetDetector.java View File

@@ -1,3 +1,7 @@
/**
* Copyright (c) 2020 Bubble, Inc. All rights reserved.
* For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
*/
package bubble.service.stream.charset; package bubble.service.stream.charset;


import java.io.InputStream; import java.io.InputStream;


+ 4
- 0
bubble-server/src/main/java/bubble/service/stream/charset/HtmlCharsetDetector.java View File

@@ -1,3 +1,7 @@
/**
* Copyright (c) 2020 Bubble, Inc. All rights reserved.
* For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
*/
package bubble.service.stream.charset; package bubble.service.stream.charset;


import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;


+ 4
- 0
bubble-server/src/main/java/bubble/service/stream/charset/HtmlStreamCharsetDetector.java View File

@@ -1,3 +1,7 @@
/**
* Copyright (c) 2020 Bubble, Inc. All rights reserved.
* For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
*/
package bubble.service.stream.charset; package bubble.service.stream.charset;


import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;


+ 4
- 0
bubble-server/src/test/java/bubble/test/filter/CharsetDetectionTest.java View File

@@ -1,3 +1,7 @@
/**
* Copyright (c) 2020 Bubble, Inc. All rights reserved.
* For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
*/
package bubble.test.filter; package bubble.test.filter;


import bubble.model.app.AppMatcher; import bubble.model.app.AppMatcher;


+ 4
- 0
bubble-server/src/test/java/bubble/test/filter/PassthruDriver.java View File

@@ -1,3 +1,7 @@
/**
* Copyright (c) 2020 Bubble, Inc. All rights reserved.
* For personal (non-commercial) use, see license: https://getbubblenow.com/bubble-license/
*/
package bubble.test.filter; package bubble.test.filter;


import bubble.resources.stream.FilterHttpRequest; import bubble.resources.stream.FilterHttpRequest;


+ 0
- 0
View File


+ 0
- 0
View File


+ 1
- 1
bubble-web

@@ -1 +1 @@
Subproject commit c0fc1fee1e80226829fd8f55ad1f4e13d8908107
Subproject commit 970398336cd27b2cc76f8246814a2cafc2ab9105

+ 1
- 1
utils/cobbzilla-utils

@@ -1 +1 @@
Subproject commit a9d3d69f1112a47b8d69f9343cc66caf5bab1383
Subproject commit da9910657301c1df8e1e1158925c2324d4cbe222

Loading…
Cancel
Save