Skip to content

Commit db162a1

Browse files
committed
Added local changes with jscience
1 parent fc38740 commit db162a1

3 files changed

Lines changed: 30 additions & 0 deletions

File tree

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,11 @@
8787
<artifactId>spring-boot-devtools</artifactId>
8888
<scope>runtime</scope>
8989
</dependency>
90+
<dependency>
91+
<groupId>org.jscience</groupId>
92+
<artifactId>jscience</artifactId>
93+
<version>4.3.1</version>
94+
</dependency>
9095
</dependencies>
9196

9297
<build>

src/main/java/com/example/MainController.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import com.zaxxer.hikari.HikariConfig;
2020
import com.zaxxer.hikari.HikariDataSource;
21+
import org.jscience.physics.amount.Amount;
22+
import org.jscience.physics.model.RelativisticModel;
2123
import org.springframework.beans.factory.annotation.Autowired;
2224
import org.springframework.beans.factory.annotation.Value;
2325
import org.springframework.boot.SpringApplication;
@@ -26,6 +28,7 @@
2628
import org.springframework.stereotype.Controller;
2729
import org.springframework.web.bind.annotation.RequestMapping;
2830

31+
import javax.measure.quantity.Mass;
2932
import javax.sql.DataSource;
3033
import java.sql.Connection;
3134
import java.sql.ResultSet;
@@ -34,6 +37,8 @@
3437
import java.util.ArrayList;
3538
import java.util.Map;
3639

40+
import static javax.measure.unit.SI.KILOGRAM;
41+
3742
@Controller
3843
@SpringBootApplication
3944
public class MainController {
@@ -53,6 +58,14 @@ String index() {
5358
return "index";
5459
}
5560

61+
@RequestMapping("/hello")
62+
String hello(Map<String, Object> model) {
63+
RelativisticModel.select();
64+
Amount<Mass> m = Amount.valueOf("12 GeV").to(KILOGRAM);
65+
model.put("science", "E=mc^2: 12 GeV = " + m.toString());
66+
return "hello";
67+
}
68+
5669
@RequestMapping("/db")
5770
String db(Map<String, Object> model) {
5871
try (Connection connection = dataSource.getConnection()) {
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<!DOCTYPE html>
2+
<html xmlns:th="http://www.thymeleaf.org" th:replace="~{fragments/layout :: layout (~{::body},'db')}">
3+
4+
<body>
5+
6+
7+
<div class="container">
8+
<p th:text="${science}"/>
9+
</div>
10+
11+
</body>
12+
</html>

0 commit comments

Comments
 (0)