replace threadlocal

daggerok · daggerok · commit 1267fe17bc4a · 2016-09-07T07:13:15.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,11 @@
-ui/node_modules/
-src/main/resources/static/
-out/
-build/
-gradle/
-.gradle/
+ui/node_modules
+src/main/resources/static
+out
+build
+gradle
+.gradle
 gradlew*
-**/.idea/
+**/.idea
 **/*.log*
 **/*.ipr
 **/*.iml
diff --git a/README.md b/README.md
@@ -5,6 +5,7 @@ build
 
 ```fish
 gradle ui build
+bash build/libs/*.jar
 ```
 
 backend development
diff --git a/build.gradle b/build.gradle
@@ -38,3 +38,8 @@ build.shouldRunAfter ui
 task wrapper(type: Wrapper) {
   gradleVersion = '3.0'
 }
+
+// bash build/libs/*.jar
+springBoot {
+  executable = true
+}
diff --git a/src/main/java/daggerok/react/React.java b/src/main/java/daggerok/react/React.java
@@ -1,11 +1,11 @@
 package daggerok.react;
 
-import jdk.nashorn.api.scripting.NashornScriptEngine;
 import lombok.SneakyThrows;
 import lombok.val;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import javax.script.Invocable;
 import javax.script.ScriptEngineManager;
 import java.io.InputStreamReader;
 import java.io.Reader;
@@ -16,31 +16,33 @@
 @Component
 public class React {
 
-    private ThreadLocal<NashornScriptEngine> engineHolder;
+    private Invocable nashorn;
 
+    @SneakyThrows
     @PostConstruct
-    public void init() {
-
-        val nashornScriptEngine = (NashornScriptEngine) new ScriptEngineManager().getEngineByName("nashorn");
-
-        engineHolder = new ThreadLocal<NashornScriptEngine>() {
-            @Override @SneakyThrows
-            protected NashornScriptEngine initialValue() {
-                nashornScriptEngine.eval(read("nashorn/polyfill.js"));
-                nashornScriptEngine.eval(read("static/app.js"));
-                return nashornScriptEngine;
-            }
-        };
+    private void init() {
+        // val engine = new ScriptEngineManager().getEngineByExtension("js");
+        val engine = new ScriptEngineManager().getEngineByName("nashorn");
+
+        engine.eval(read("nashorn/polyfill.js"));
+        engine.eval(read("static/app.js"));
+
+        this.nashorn = (Invocable) engine;
     }
 
     @SneakyThrows
     public String renderApp() {
 
-        val html = engineHolder.get().invokeFunction("renderServer");
+        val html = call("renderServer");
 
         return String.valueOf(html);
     }
 
+    @SneakyThrows
+    public Object call(String function, Object... arguments) {
+        return nashorn.invokeFunction(function, arguments);
+    }
+
     @SneakyThrows
     private Reader read(String path) {
 
diff --git a/src/main/resources/nashorn/polyfill.js b/src/main/resources/nashorn/polyfill.js
@@ -1,5 +1,4 @@
 var window = this;
-var global = this;
 var console = {};
 
 console.error = print;
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
@@ -7,8 +7,8 @@
 <body>
 <!-- 1) render data from backend server side (see daggerok.react.ReactServerSideRenderingController.index) -->
 <div id="app">{{{data}}}</div>
-<script type="text/javascript" src="/app.js"></script>
-<!-- 2) up and running dynamic part of site after it static initial page pf app was loader -->
+<script src="/app.js"></script>
+<!-- 2) up and running dynamic part of application after it static initial page was loader -->
 <script type="text/javascript">
   $(function() {
     renderClient();
diff --git a/ui/package.json b/ui/package.json
@@ -47,7 +47,7 @@
     "json-server": "*",
     "less": "*",
     "less-loader": "*",
-    "npm-run-all": "^3.1.0",
+    "npm-run-all": "*",
     "opn-cli": "*",
     "postcss-loader": "*",
     "rimraf": "*",
diff --git a/ui/src/assets/index.hbs b/ui/src/assets/index.hbs
@@ -3,15 +3,18 @@
 <head>
   <meta charset="UTF-8">
   <title>fast-react-starter</title>
+  {{htmlWebpackPlugin.options.files.css}}
 </head>
 <body>
-<div id="app"></div>
-<!--
+<!-- 1) render data from backend server side (see daggerok.react.ReactServerSideRenderingController.index) -->
+<div id="app">{{{data}}}</div>
+{{htmlWebpackPlugin.options.files.js}}
+<!-- 2) up and running dynamic part of application after it static initial page was loader -->
 <script type="text/javascript">
-  $(function () {
+  $(function() {
+    // renderClient({{response}});
     renderClient();
   });
 </script>
--->
 </body>
 </html>
diff --git a/ui/src/main.js b/ui/src/main.js
@@ -40,9 +40,9 @@ class App extends Component {
   }
 }
 
-window.renderClient = function() {
-// const renderClient = (comments) => {
-// const data = comments || [];
+global.renderClient = function() {
+// const renderClient = (data) => {
+// const data = data || [];
   return render(
     <Router history={browserHistory}>
       <Route path="/" component={App}>
@@ -56,10 +56,10 @@ window.renderClient = function() {
 };
 
 import { renderToString } from 'react-dom/server'
-window.renderServer = function() {
-// const renderServer = (comments) => {
-// const data = Java.from(comments);
-  return renderToString(<App><NotFound/></App>);
+global.renderServer = function() {
+// const renderServer = (data) => {
+// const data = Java.from(data);
+  return renderToString(<App><Main/></App>);
 };
 
 import $ from 'jquery';

Original file line number	Diff line number	Diff line change
`@@ -38,3 +38,8 @@ build.shouldRunAfter ui`
`38`	`38`	`task wrapper(type: Wrapper) {`
`39`	`39`	`gradleVersion = '3.0'`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+// bash build/libs/*.jar`
	`43`	`+springBoot {`
	`44`	`+ executable = true`
	`45`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`var window = this;`
`2`		`-var global = this;`
`3`	`2`	`var console = {};`
`4`	`3`
`5`	`4`	`console.error = print;`