App migrated to jdk11

manifest.yml

@@ -3,9 +3,11 @@ applications:
 - name: objectstore-sample-svc
  host: objectstore-sample-svc
  memory: 2G
- buildpack: https://github.com/cloudfoundry/java-buildpack.git
- path: target/objectstore-sample-1.0.1.jar
+ buildpack: sap_java_buildpack
+ path: target/objectstore-sample-1.1.1.jar
  env:
  JBP_CONFIG_SPRING_AUTO_RECONFIGURATION: '{enabled: false}'
+ JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jdk.SAPMachineJDK']"
+ JBP_CONFIG_SAP_MACHINE_JRE: '{ jre: { version: "11.+" } }'
  services:
  - objectstore-service

pom.xml

@@ -5,7 +5,7 @@
 
 <groupId>com.sap.refapps.objectstore</groupId>
 <artifactId>objectstore-sample</artifactId>
-<version>1.0.1</version>
+<version>1.1.1</version>
 <packaging>jar</packaging>
 
 <name>objectstore-sample</name>
@@ -21,9 +21,10 @@
 <properties>
 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-<java.version>1.8</java.version>
+<java.version>11</java.version>
 <jclouds.version>2.3.0</jclouds.version>
 <log4j2.version>2.17.0</log4j2.version>
+<guice.assistedinject.version>5.1.0</guice.assistedinject.version>
 <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 </properties>
 
@@ -71,6 +72,13 @@
 <artifactId>commons-fileupload</artifactId>
 <version>1.3.3</version>
 </dependency>
+
+<!-- guice assistedinject -->
+<dependency>
+<groupId>com.google.inject.extensions</groupId> <!-- Also managed by jclouds. The version is overriden to remove illegal reflective access error caused upon jdk11 migration -->
+<artifactId>guice-assistedinject</artifactId>
+<version>${guice.assistedinject.version}</version>
+</dependency>
 
 </dependencies>
 <build>

src/main/java/com/sap/refapps/objectstore/controller/ObjectstoreController.java

@@ -67,10 +67,10 @@ public ResponseEntity<String> uploadFile(HttpServletRequest request) throws IOEx
 String message = "";
 Optional<FileItemStream> fileItemStream = Optional.empty();
 
-boolean isMultipart = ServletFileUpload.isMultipartContent(request);
+var isMultipart = ServletFileUpload.isMultipartContent(request);
 
 if(isMultipart) {
-ServletFileUpload upload = new ServletFileUpload();
+var upload = new ServletFileUpload();
 FileItemIterator fileItemIterator = upload.getItemIterator(request);
 
 while(fileItemIterator.hasNext()) {
@@ -95,11 +95,11 @@ public ResponseEntity<String> uploadFile(HttpServletRequest request) throws IOEx
 public ResponseEntity<InputStreamResource> getFile(@PathVariable(value = "name") String fileName) {
 
 if (fileName != null) {
-HttpHeaders respHeaders = new HttpHeaders();
+var respHeaders = new HttpHeaders();
 
 if (this.objectStoreService.isBlobExist(fileName)) {
 respHeaders.setContentDispositionFormData("attachment", fileName);
-InputStreamResource inputStreamResource = new InputStreamResource(this.objectStoreService.getFile(fileName));
+var inputStreamResource = new InputStreamResource(this.objectStoreService.getFile(fileName));
 return new ResponseEntity<InputStreamResource>(inputStreamResource, respHeaders, HttpStatus.OK);
 } else {
 return errorMessage(fileName + ObjectStoreUtil.FILE_DOESNOT_EXIST, HttpStatus.NOT_FOUND);
@@ -117,7 +117,7 @@ public ResponseEntity<InputStreamResource> getFile(@PathVariable(value = "name")
  */
 @DeleteMapping("/storage/{name}")
 public ResponseEntity<String> deleteFile(@PathVariable(value = "name") String fileName) {
-String msg = ObjectStoreUtil.CANNOT_DELETE_NULL;
+var msg = ObjectStoreUtil.CANNOT_DELETE_NULL;
 if (fileName != null) {
 if (this.objectStoreService.isBlobExist(fileName)) {
 if (this.objectStoreService.deleteFile(fileName)) {
@@ -143,7 +143,7 @@ public ResponseEntity<String> deleteFile(@PathVariable(value = "name") String fi
  * helper function to form the responseEntity
  */
 private static ResponseEntity errorMessage(String message, HttpStatus status) {
-HttpHeaders headers = new HttpHeaders();
+var headers = new HttpHeaders();
 headers.setContentType(org.springframework.http.MediaType.TEXT_PLAIN);
 
 return ResponseEntity.status(status).headers(headers).body(message);

src/main/java/com/sap/refapps/objectstore/service/AWSObjectStoreService.java

@@ -34,7 +34,7 @@ public AWSObjectStoreService(final AmazonWebServiceConfiguration awsConfig, Obje
 public String uploadFile(byte[] bytes, String fileName, String contentType) {
 repository.setContext(awsConfig.getBlobStoreContext());
 logger.info("Upload started");
-String message = repository.uploadFile(containerName, bytes, fileName, contentType);
+var message = repository.uploadFile(containerName, bytes, fileName, contentType);
 logger.info("upload completed");
 return message;
 }
@@ -48,22 +48,22 @@ public List<BlobFile> listObjects() {
 @Override
 public InputStream getFile(String fileName) {
 repository.setContext(awsConfig.getBlobStoreContext());
-InputStream inputStream = repository.downloadFile(containerName, fileName);
+var inputStream = repository.downloadFile(containerName, fileName);
 return inputStream;
 }
 
 @Override
 public boolean deleteFile(String fileName) {
 repository.setContext(awsConfig.getBlobStoreContext());
-boolean status = repository.deleteFile(containerName, fileName);
+var status = repository.deleteFile(containerName, fileName);
 return status;
 
 }
 
 @Override
 public boolean isBlobExist(String fileName) {
 repository.setContext(awsConfig.getBlobStoreContext());
-boolean status = repository.isBlobExist(containerName, fileName);
+var status = repository.isBlobExist(containerName, fileName);
 return status;
 }
 }

src/main/java/com/sap/refapps/objectstore/service/AzureObjectStoreService.java

@@ -33,7 +33,7 @@ public AzureObjectStoreService(final AzureStorageConfiguration azureConfig, Obje
 public String uploadFile(byte[] bytes, String fileName, String contentType) {
 repository.setContext(azureConfig.getBlobStoreContext());
 logger.info("Upload started");
-String message = repository.uploadFile(containerName, bytes, fileName, contentType);
+var message = repository.uploadFile(containerName, bytes, fileName, contentType);
 logger.info("Upload completed");
 
 return message;
@@ -51,7 +51,7 @@ public List<BlobFile> listObjects() {
 @Override
 public InputStream getFile(String fileName) {
 repository.setContext(azureConfig.getBlobStoreContext());
-InputStream inputStream = repository.downloadFile(containerName, fileName);
+var inputStream = repository.downloadFile(containerName, fileName);
 
 return inputStream;
 }
@@ -60,7 +60,7 @@ public InputStream getFile(String fileName) {
 public boolean deleteFile(String fileName) {
 repository.setContext(azureConfig.getBlobStoreContext());
 logger.info("Deletion started");
-boolean status = repository.deleteFile(containerName, fileName);
+var status = repository.deleteFile(containerName, fileName);
 logger.info("Deletion completed");
 
 return status;
@@ -70,7 +70,7 @@ public boolean deleteFile(String fileName) {
 @Override
 public boolean isBlobExist(String fileName) {
 repository.setContext(azureConfig.getBlobStoreContext());
-boolean status = repository.isBlobExist(containerName, fileName);
+var status = repository.isBlobExist(containerName, fileName);
 
 return status;
 }

src/main/java/com/sap/refapps/objectstore/service/GCPObjectStoreService.java

@@ -34,7 +34,7 @@ public GCPObjectStoreService(final GoogleCloudPlatformConfiguration gcpConfig, f
 public String uploadFile(byte[] bytes, String fileName, String contentType) {
 repository.setContext(gcpConfig.getBlobStoreContext());
 logger.info("Upload started");
-String message = repository.uploadFile(containerName, bytes, fileName, contentType);
+var message = repository.uploadFile(containerName, bytes, fileName, contentType);
 logger.info("upload completed");
 return message;
 }
@@ -48,22 +48,22 @@ public List<BlobFile> listObjects() {
 @Override
 public InputStream getFile(String fileName) {
 repository.setContext(gcpConfig.getBlobStoreContext());
-InputStream inputStream = repository.downloadFile(containerName, fileName);
+var inputStream = repository.downloadFile(containerName, fileName);
 return inputStream;
 }
 
 @Override
 public boolean deleteFile(String fileName) {
 repository.setContext(gcpConfig.getBlobStoreContext());
-boolean blobRemove = repository.deleteFile(containerName, fileName);
+var blobRemove = repository.deleteFile(containerName, fileName);
 return blobRemove;
 
 }
 
 @Override
 public boolean isBlobExist(String fileName) {
 repository.setContext(gcpConfig.getBlobStoreContext());
-boolean blobExist = repository.isBlobExist(containerName, fileName);
+var blobExist = repository.isBlobExist(containerName, fileName);
 return blobExist;
 }