DSL impl fixed

Author: banadiga

README.md

@@ -18,6 +18,7 @@ Sandbox to play with spring cloud features
 | Realtor service| Realtor Api Service | 8080| To call other services used Feign, RestTemplate |
 | Storage service| Storage of Apartment Records Service | 8091| H2 based service for ApartmentRecord data storage. |
 | API gateway service| Zull API Gateway Service | 8090| |
+| DSL executor service | DSL executor service | 8088| |
 
 
 # Dev

dsl-executor-service/src/main/java/com/lohika/jclub/dsl/service/DslController.java

@@ -1,24 +1,15 @@
 package com.lohika.jclub.dsl.service;
 
-import groovy.lang.GroovyShell;
-import groovy.util.DelegatingScript;
-
 import com.lohika.jclub.dsl.MyDsl;
-import com.lohika.jclub.rating.client.RatingServiceClient;
-import com.lohika.jclub.storage.client.StorageServiceClient;
 
-import org.codehaus.groovy.control.CompilerConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.io.File;
 import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 
 @RestController
 @RequestMapping(path = "/dsl")
@@ -28,27 +19,10 @@ public class DslController {
   private String basepath;
 
   @Autowired
-  private StorageServiceClient storageServiceClient;
-
-  @Autowired
-  private RatingServiceClient ratingServiceClient;
+  private DslService dslService;
 
   @GetMapping(path = "/{scriptName}")
-  public Object runScript(@PathVariable(name = "scriptName") String scriptName) throws IOException {
-    File file = new File(basepath + scriptName + ".mydsl");
-    String script = new String(Files.readAllBytes(Paths.get(file.getPath())));
-
-    MyDsl dsl = new MyDsl(ratingServiceClient, storageServiceClient);
-
-    CompilerConfiguration configuration = new CompilerConfiguration();
-    configuration.setScriptBaseClass(DelegatingScript.class.getName());
-
-    GroovyShell groovy = new GroovyShell(configuration);
-
-    DelegatingScript delegatingScript = (DelegatingScript) groovy.parse(script);
-    delegatingScript.setDelegate(dsl);
-    delegatingScript.run();
-
-    return dsl;
+  public MyDsl runScript(@PathVariable(name = "scriptName") String scriptName) throws IOException {
+    return dslService.runScript(scriptName);
   }
 }

dsl-executor-service/src/main/java/com/lohika/jclub/dsl/service/DslService.java

@@ -0,0 +1,57 @@
+package com.lohika.jclub.dsl.service;
+
+import groovy.lang.GroovyShell;
+import groovy.util.DelegatingScript;
+
+import com.lohika.jclub.dsl.MyDsl;
+import com.lohika.jclub.rating.client.RatingServiceClient;
+import com.lohika.jclub.storage.client.StorageServiceClient;
+
+import org.codehaus.groovy.control.CompilerConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+@Service
+public class DslService {
+  private static final String DSL_EXTENSION = ".mydsl";
+
+  @Value("${dsl.basepath}")
+  private String basepath;
+
+  @Autowired
+  private StorageServiceClient storageServiceClient;
+
+  @Autowired
+  private RatingServiceClient ratingServiceClient;
+
+  public MyDsl runScript(String scriptName) throws IOException {
+    String script = getScriptByName(scriptName);
+    return run(script);
+  }
+
+  private String getScriptByName(String scriptName) throws IOException {
+    File file = new File(basepath + scriptName + DSL_EXTENSION);
+    return new String(Files.readAllBytes(Paths.get(file.getPath())));
+  }
+
+  private MyDsl run(String script) {
+    MyDsl dsl = new MyDsl(ratingServiceClient, storageServiceClient);
+
+    CompilerConfiguration configuration = new CompilerConfiguration();
+    configuration.setScriptBaseClass(DelegatingScript.class.getName());
+
+    GroovyShell groovy = new GroovyShell(configuration);
+
+    DelegatingScript delegatingScript = (DelegatingScript) groovy.parse(script);
+    delegatingScript.setDelegate(dsl);
+    delegatingScript.run();
+
+    return dsl;
+  }
+}

dsl-scripts/demo.mydsl

@@ -4,8 +4,8 @@ String myEmail = 'bot@company.name'
 
 (1..100).each {
   String location = "location-${it}"
-  int myPrice = 2
-  int mySqft = 1 + (it as int)
+  double myPrice = 2
+  double mySqft = 1 + (it as int)
   def rating = rating location, myPrice, mySqft
 
   if (rating > 400) {

dsl-scripts/simple.mydsl

@@ -17,12 +17,10 @@ apartment("location22", {
 
 
 apartment("location33") {
-    location "location44"
   price 1
   sqft 1
   phone 'phone'
   realtorName 'realtorName'
   mail 'mail'
-    location "location55"
 }
 

dsl/src/main/groovy/com/lohika/jclub/dsl/ApartmentDsl.groovy

@@ -1,48 +1,26 @@
 package com.lohika.jclub.dsl
 
 import com.lohika.jclub.storage.client.Apartment
+import groovy.transform.builder.Builder
+import groovy.transform.builder.SimpleStrategy
 
-//@Builder(prefix = "", builderStrategy = SimpleStrategy.class)
+@Builder(prefix = "", builderStrategy = SimpleStrategy.class)
 class ApartmentDsl {
-    String location ="location"
-    Integer price =2
-    Integer sqft =2
-    String phone ='phone'
-    String realtorName ='realtorName'
-    String mail ='mail'
-
-    void location(String location) {
-        this.location = location
-    }
-
-    void price(Integer price) {
-        this.price = price
-    }
-
-    void sqft(Integer sqft) {
-        this.sqft = sqft
-    }
-
-    void phone(String phone) {
-        this.phone = phone
-    }
-
-    void realtorName(String realtorName) {
-        this.realtorName = realtorName
-    }
-
-    void mail(String mail) {
-        this.mail = mail
-    }
-
-    def toEntity() {
-        Apartment.builder()
+  String location
+  double price
+  double sqft
+  String phone
+  String realtorName
+  String mail
+
+  def toEntity() {
+    Apartment.builder()
         .location(location)
         .price(price)
         .sqft(sqft)
         .phone(phone)
         .realtorName(realtorName)
         .mail(mail)
         .build()
-    }
+  }
 }

dsl/src/main/groovy/com/lohika/jclub/dsl/MyDsl.groovy

@@ -13,39 +13,40 @@ class MyDsl {
   private RatingServiceClient ratingServiceClient
   private StorageServiceClient storageServiceClient
 
-  def list = []
+  def apartments = []
 
   MyDsl(RatingServiceClient ratingServiceClient, StorageServiceClient storageServiceClient) {
     this.storageServiceClient = storageServiceClient
     this.ratingServiceClient = ratingServiceClient
   }
 
-  def rating (location, myPrice, mySqft) {
-    Apartment a =  Apartment.builder()
-    .sqft (mySqft)
-    .location (location)
-    .price(myPrice)
-    .build()
+  def rating(String location, double myPrice, double mySqft) {
+    Apartment apartment = Apartment.builder()
+        .sqft(mySqft)
+        .location(location)
+        .price(myPrice)
+        .build()
 
-    ratingServiceClient.getRating(a).rating
+    ratingServiceClient.getRating(apartment).rating
   }
 
-  def apartment (Closure closure) {
-    ApartmentDsl a = new ApartmentDsl()
-    closure.delegate = a
+  def apartment(Closure closure) {
+    ApartmentDsl apartment = new ApartmentDsl()
+    closure.delegate = apartment
     closure()
 
-    storageServiceClient.create(a.toEntity())
-    list.add(a)
+    storageServiceClient.create(apartment.toEntity())
+    apartments.add(apartment)
   }
 
-  def apartment (String location, Closure closure) {
-    ApartmentDsl a = new ApartmentDsl()
-    a.location = location
-    closure.delegate = a
+  def apartment(String location, Closure closure) {
+    ApartmentDsl apartment = new ApartmentDsl()
+    apartment.location = location
+
+    closure.delegate = apartment
     closure()
 
-    storageServiceClient.create(a.toEntity())
-    list.add(a)
+    storageServiceClient.create(apartment.toEntity())
+    apartments.add(apartment)
   }
 }

dsl/src/main/resources/idea.gdsl

@@ -20,6 +20,6 @@ contributor([contributorBody]) {
     method name: 'sqft', type: 'void', params: [value: 'java.lang.Double']
     method name: 'realtorName', type: 'void', params: [value: 'java.lang.String']
     method name: 'mail', type: 'void', params: [value: 'java.lang.String']
+    method name: 'phone', type: 'void', params: [value: 'java.lang.String']
   }
 }
-