Browse Source

Java/officefloor-spring update to Java 11 (#4816)

* Fix the name of SpringData Fortune repository so the discovery to work

* Update officefloor-springdata to Java 11 runtime and compilation
Radoslav Petrov 6 years ago
parent
commit
a4eb527f57

+ 1 - 1
frameworks/Java/officefloor/officefloor-spring_data.dockerfile

@@ -4,7 +4,7 @@ COPY src src
 WORKDIR /officefloor/src/woof_benchmark_spring
 WORKDIR /officefloor/src/woof_benchmark_spring
 RUN mvn -q clean package
 RUN mvn -q clean package
 
 
-FROM openjdk:10
+FROM openjdk:11.0.3-jre-slim
 WORKDIR /officefloor
 WORKDIR /officefloor
 COPY --from=maven /officefloor/src/woof_benchmark_spring/target/woof_benchmark_spring-1.0.0-exec.jar server.jar
 COPY --from=maven /officefloor/src/woof_benchmark_spring/target/woof_benchmark_spring-1.0.0-exec.jar server.jar
 CMD ["java", "-server", "-Xms2g", "-Xmx2g", "-XX:+UseNUMA", "-Dhttp.port=8080", "-Dhttp.server.name=OF", "-Dhttp.date.header=true", "-jar", "server.jar"]
 CMD ["java", "-server", "-Xms2g", "-Xmx2g", "-XX:+UseNUMA", "-Dhttp.port=8080", "-Dhttp.server.name=OF", "-Dhttp.date.header=true", "-jar", "server.jar"]

+ 1 - 5
frameworks/Java/officefloor/src/woof_benchmark_spring/pom.xml

@@ -10,11 +10,7 @@
 	</parent>
 	</parent>
 	<artifactId>woof_benchmark_spring</artifactId>
 	<artifactId>woof_benchmark_spring</artifactId>
 	<packaging>jar</packaging>
 	<packaging>jar</packaging>
-	<properties>
-		<maven.compiler.source>10</maven.compiler.source>
-		<maven.compiler.target>10</maven.compiler.target>
-		<officefloor.version>3.4.0</officefloor.version>
-	</properties>
+
 	<dependencies>
 	<dependencies>
 		<dependency>
 		<dependency>
 			<groupId>net.officefloor.web</groupId>
 			<groupId>net.officefloor.web</groupId>

+ 1 - 1
frameworks/Java/officefloor/src/woof_benchmark_spring/src/main/java/net/officefloor/benchmark/FortunueRepository.java → frameworks/Java/officefloor/src/woof_benchmark_spring/src/main/java/net/officefloor/benchmark/FortuneRepository.java

@@ -4,5 +4,5 @@ import org.springframework.data.repository.CrudRepository;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
 @Repository
 @Repository
-public interface FortunueRepository extends CrudRepository<Fortune, Integer> {
+public interface FortuneRepository extends CrudRepository<Fortune, Integer> {
 }
 }

+ 1 - 1
frameworks/Java/officefloor/src/woof_benchmark_spring/src/main/java/net/officefloor/benchmark/FortunesLogic.java

@@ -8,7 +8,7 @@ import java.util.List;
  */
  */
 public class FortunesLogic {
 public class FortunesLogic {
 
 
-	public Fortune[] getFortunes(FortunueRepository repository) {
+	public Fortune[] getFortunes(FortuneRepository repository) {
 		List<Fortune> fortunes = new ArrayList<>();
 		List<Fortune> fortunes = new ArrayList<>();
 		repository.findAll().forEach((fortune) -> fortunes.add(fortune));
 		repository.findAll().forEach((fortune) -> fortunes.add(fortune));
 		fortunes.add(new Fortune(0, "Additional fortune added at request time."));
 		fortunes.add(new Fortune(0, "Additional fortune added at request time."));