AA

miguelperezcolom · Jul 14, 2019 · 088b235 · 088b235
1 parent 4579b13
commit 088b235
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 2 deletions.
diff --git a/mdd-core/src/main/java/io/mateu/mdd/core/annotations/NonDuplicable.java b/mdd-core/src/main/java/io/mateu/mdd/core/annotations/NonDuplicable.java
@@ -0,0 +1,14 @@
+package io.mateu.mdd.core.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Created by miguel on 18/1/17.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE) //can use in method only.
+public @interface NonDuplicable {
+}
diff --git a/mdd-core/src/main/java/io/mateu/mdd/core/model/config/AppConfig.java b/mdd-core/src/main/java/io/mateu/mdd/core/model/config/AppConfig.java
@@ -1,7 +1,11 @@
 package io.mateu.mdd.core.model.config;
 
 import com.google.common.base.Strings;
+import com.vaadin.server.ExternalResource;
 import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Link;
+import com.vaadin.ui.VerticalLayout;
 import io.mateu.mdd.core.MDD;
 import io.mateu.mdd.core.annotations.*;
 import io.mateu.mdd.core.model.util.EmailHelper;
@@ -91,6 +95,12 @@ public class AppConfig {
 
     });
 
+    @Transient
+    private VerticalLayout gmailRequiredLinks = new VerticalLayout(
+            new Link("https://myaccount.google.com/lesssecureapps", new ExternalResource("https://myaccount.google.com/lesssecureapps"))
+            , new Link("https://accounts.google.com/DisplayUnlockCaptcha", new ExternalResource("https://accounts.google.com/DisplayUnlockCaptcha"))
+    );
+
 
     private String pop3Host;
 
@@ -152,4 +162,33 @@ public void run(EntityManager em) throws Throwable {
         });
     }
 
+    public static void main(String[] args) {
+       testPureEmail();
+    }
+
+    private static void testPureEmail() {
+        try {
+
+            HtmlEmail email = new HtmlEmail();
+            email.setHostName("smtp.gmail.com");
+            email.setSmtpPort(587);
+            email.setAuthenticator(new DefaultAuthenticator("miguelperezcolom@gmail.com", ""));
+            email.setSSLOnConnect(false);
+            email.setStartTLSEnabled(true);
+            email.setFrom("miguelperezcolom@gmail.com");
+
+            email.setSubject("Test email");
+            email.setHtmlMsg("This is a test email");
+            email.addTo("miguelperezcolom@gmail.com");
+
+            EmailHelper.send(email);
+
+
+            System.out.println("Email sent OK");
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
 }
diff --git a/...n/java/io/mateu/mdd/vaadinport/vaadin/components/fieldBuilders/JPADoubleFieldBuilder.java b/...n/java/io/mateu/mdd/vaadinport/vaadin/components/fieldBuilders/JPADoubleFieldBuilder.java
@@ -70,6 +70,7 @@ public String convertToPresentation(Double value, ValueContext context) {
                     //String s = super.convertToPresentation(value, context);
                     String s = "" + value;
                     if (s.endsWith(".0")) s = s.replaceAll("\\.0", "");
+                    System.out.println("------------------>JPADoubleFieldBuilder.convertToPresentation()=" + s);
                     return s;
                 }
             }

diff --git a/...src/main/java/io/mateu/mdd/vaadinport/vaadin/components/oldviews/EditorViewComponent.java b/...src/main/java/io/mateu/mdd/vaadinport/vaadin/components/oldviews/EditorViewComponent.java
@@ -756,7 +756,7 @@ public void menuSelected(MenuBar.MenuItem menuItem) {
                 }
             }
 
-            if ((modelType.isAnnotationPresent(Entity.class) || PersistentPOJO.class.isAssignableFrom(modelType)) && !isActionPresent("duplicate") && !isNewRecord()) {
+            if ((modelType.isAnnotationPresent(Entity.class) || PersistentPOJO.class.isAssignableFrom(modelType)) && !modelType.isAnnotationPresent(NonDuplicable.class) && !isActionPresent("duplicate") && !isNewRecord()) {
 
                 MenuBar.Command cmd;
                 MenuBar.MenuItem i = bar.addItem("Duplicate", VaadinIcons.COPY, cmd = new MenuBar.Command() {

diff --git a/mdd-core/src/main/java/io/mateu/mdd/vaadinport/vaadin/pojos/Profile.java b/mdd-core/src/main/java/io/mateu/mdd/vaadinport/vaadin/pojos/Profile.java
@@ -1,5 +1,6 @@
 package io.mateu.mdd.vaadinport.vaadin.pojos;
 
+import io.mateu.mdd.core.annotations.NonDuplicable;
 import io.mateu.mdd.core.data.UserData;
 import io.mateu.mdd.core.util.JPATransaction;
 import lombok.Getter;
@@ -20,7 +21,7 @@
 import javax.validation.constraints.NotNull;
 import java.io.IOException;
 
-@Getter@Setter
+@Getter@Setter@NonDuplicable
 public class Profile implements PersistentPOJO {
 
     @Ignored

diff --git a/mdd-vaadin/src/test/java/io/mateu/mdd/tester/app/simpleCase/SimpleApp.java b/mdd-vaadin/src/test/java/io/mateu/mdd/tester/app/simpleCase/SimpleApp.java
@@ -7,6 +7,7 @@
 import io.mateu.mdd.core.annotations.Caption;
 import io.mateu.mdd.core.annotations.SubApp;
 import io.mateu.mdd.core.app.*;
+import io.mateu.mdd.core.model.config.AppConfig;
 import io.mateu.mdd.core.reflection.FieldInterfaced;
 import io.mateu.mdd.core.util.Helper;
 import io.mateu.mdd.tester.model.entities.basic.BasicFieldsDemoEntity;
@@ -24,6 +25,13 @@ public class SimpleApp extends SimpleMDDApplication {
 
 
 
+    @Action(order = 0)
+    public Class appconfig() {
+        return AppConfig.class;
+    }
+
+
+
     @Action(value = "Say hello", order = 1)
     public String hello(String name) {
         return "Hello " + name + "!";