view pdf content

README.md

@@ -1,8 +1,17 @@
 # Storage-service
 Сервис обмена файлами большого размера
 
-## API
+# Realization
+Файлы хранятся не в базе данных, а в самостоятельном хранилице на сервере,
+в базе хранятся адреса файлов, их описания,
+
+
+# API
 - getFile
 - postFile
 - deleteFile
-- listFiles
+- listFiles
+
+# Servlets
+
+- viewFile

pom.xml

@@ -15,8 +15,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
   <dependencies>
@@ -88,6 +88,30 @@
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
           <version>2.8.2</version>
+          <configuration>
+              <!-- отключаю плагин по умолчанию -->
+              <skip>true</skip>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.wildfly.plugins</groupId>
+          <artifactId>wildfly-maven-plugin</artifactId>
+          <version>4.1.0.Final</version>
+          <executions>
+              <execution>
+                  <phase>deploy</phase>
+                  <goals>
+                      <goal>deploy</goal>
+                  </goals>
+              </execution>
+          </executions>
+          <configuration>
+            <hostname>molokoin.ru</hostname>
+            <port>9990</port>
+            <username>esoe</username>
+            <password>psalm6912</password>
+            <name>storage.war</name>
+          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>

src/main/java/ru/molokoin/storage/api/RestStorageService.java

@@ -1,9 +1,20 @@
 package ru.molokoin.storage.api;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Set;
 
 import jakarta.ejb.EJB;
+import jakarta.servlet.ServletOutputStream;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
@@ -12,8 +23,9 @@ import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
+import ru.molokoin.storage.beans.HardDrive;
+import ru.molokoin.storage.beans.StorageFace;
 import ru.molokoin.storage.entities.ContentEntity;
-import ru.molokoin.storage.services.StorageFace;
 
 @Path("content")
 public class RestStorageService {
@@ -30,14 +42,72 @@ public class RestStorageService {
      * 
      * @return
      */
+    // @GET
+    // @Produces(MediaType.APPLICATION_XML)
+    // public Collection<ContentEntity> getInfo(){
+    //     System.out.println("Передача данных обо всех файлах ...");
+    //     Collection<ContentEntity> cce = storage.getInfo();
+    //     return cce;
+    // }
+
+    /**
+     * Получение сведений о контенте из файловой системы
+     * @return
+     */
     @GET
     @Produces(MediaType.APPLICATION_XML)
     public Collection<ContentEntity> getInfo(){
-        System.out.println("Передача данных обо всех файлах ...");
+        System.out.println("Передача данных о контенте из файловой системы ...");
-        Collection<ContentEntity> cce = storage.getInfo();
+        Collection<ContentEntity> cce = new ArrayList<>();
+        try {
+            Set<String> list = HardDrive.listFiles(HardDrive.getRoot());
+            int i = 1;
+            for (String path : list) {
+                ContentEntity ce = new ContentEntity();
+                ce.setId((long)i);
+                i++;
+                ce.setFilename(Paths.get(path).toString());
+                ce.setLocation(HardDrive.getRoot());
+                cce.add(ce);
+            }
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
         return cce;
     }
 
+    @GET
+    @Path("q/{id}")
+    @Produces(MediaType.APPLICATION_XML)
+    //@Produces(MediaType.MULTIPART_FORM_DATA)
+    public ContentEntity getInfoById(@PathParam("id") Integer id, @Context HttpServletResponse response){
+        Collection<ContentEntity> cce = new ArrayList<>();
+        ContentEntity ce = new ContentEntity();
+        try {
+            Set<String> list = HardDrive.listFiles(HardDrive.getRoot());
+            int i = 1;
+            for (String path : list) {
+                if (id == i) {
+                    ce.setId((long)i);
+                    ce.setFilename(Paths.get(path).toString());
+                    ce.setLocation(HardDrive.getRoot());
+                    cce.add(ce);
+                }
+                i++;
+            }
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return ce;
+    }
+
+
+
+
+
+
     // @GET
     // @Path("{id}")
     // @Produces(MediaType.APPLICATION_OCTET_STREAM)
@@ -49,12 +119,54 @@ public class RestStorageService {
     // }
 
     // @GET
+    // @Path("{id}")
     // @Produces(MediaType.APPLICATION_OCTET_STREAM)
-    // public Response getFile() {
+    // public File getFile(@PathParam("id") Integer id, @Context HttpServletResponse response) {
-    // File file = ... // Initialize this to the File path you want to serve.
+    //     ContentEntity ce = getInfoById(1, response);
-    // return Response.ok(file, MediaType.APPLICATION_OCTET_STREAM)
+
-    //     .header("Content-Disposition", "attachment; filename=\"" + file.getName() + "\"" ) //optional
+    //     File file = new File(ce.getLocation()); // Initialize this to the File path you want to serve.
-    //     .build();
+    //     // return Response.ok(file, MediaType.APPLICATION_OCTET_STREAM)
+    //     //     .header("Content-Disposition", "attachment; filename=\"" + file.getName() + "\"" ) //optional
+    //     //     .build();
+    //     return file;
     // }
 
+    /**
+     * Получение файла (*.pdf) на просмотр по id
+     * !!! добавить возможность открытия файлов других типов
+     * @param id
+     * @param response
+     * @return
+     * @throws IOException
+     */
+    @GET
+    @Path("{id}")
+    public Response viewContent(@PathParam("id") Integer id,
+                            @Context HttpServletResponse response) throws IOException {
+        try {
+            System.out.println(">>>>>>>>>>>>>>>> SHOW the FILE <<<<<<<<<<<<<<<");
+            ContentEntity ce = getInfoById(id, response);
+            java.nio.file.Path path = Paths.get(ce.getLocation() + File.separator + ce.getFilename());
+            System.out.println("------- PATH: " + path.toString());
+            long size = Files.size(path);
+            response.setContentLength((int) size);
+            // response.setContentType("text/markdown");
+            response.setCharacterEncoding("UTF-8");
+            response.setContentType("application/pdf");
+            response.setHeader("Content-disposition","inline; filename=\"" + ce.getFilename() + "\"");
+            ServletOutputStream outStream = response.getOutputStream();
+            byte[] buffer = new byte[1024];
+            FileInputStream fis = new FileInputStream(path.toFile());
+            // HardDrive.getBais(id);
+            int length = 0;
+            while ((fis != null) && ((length = fis.read(buffer)) != -1)) {
+                outStream.write(buffer, 0, length);
+            }
+            fis.close();
+            outStream.flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return Response.ok().build();
+    }
 }

src/main/java/ru/molokoin/storage/beans/HardDrive.java

@@ -0,0 +1,78 @@
+package ru.molokoin.storage.beans;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import ru.molokoin.storage.entities.ContentEntity;
+
+/**
+ * Методы работы с данными на жестком диске
+ */
+public class HardDrive {
+    public static String root = "/srv/apps/home/exchange";
+    
+    public static String getRoot() {
+        return root;
+    }
+    public static void setRoot(String root) {
+        HardDrive.root = root;
+    }
+    /**
+     * Метод, возвращающий список файлов в корне хранилища приложения
+     * @return
+     * @throws IOException
+     */
+    public static  Set<String> listFiles(String path) throws IOException{
+        Stream<Path> stream = Files.list(Paths.get(path));
+        Set<String> list = stream
+            .filter(file -> !Files.isDirectory(file))
+            .map(Path::getFileName)
+            .map(Path::toString)
+            .collect(Collectors.toSet());
+        stream.close();
+        return list;
+    }
+
+    private static  HashMap<String, Boolean> getMap(String path) throws IOException{
+        Stream<Path> stream = Files.list(Paths.get(path));
+        HashMap<String, Boolean> map = new HashMap<>();
+        return map;
+    }
+
+
+    public static void showFiles(File[] files) {
+        for (File file : files) {
+            if (file.isDirectory()) {
+                System.out.println("Directory: " + file.getAbsolutePath());
+                showFiles(file.listFiles()); // Calls same method again.
+            } else {
+                System.out.println("File: " + file.getAbsolutePath());
+            }
+        }
+    }
+
+    public static Path getFileById(int id) throws IOException{
+        Path path = null;
+        Set<String> set = listFiles(root);
+        int i = 0;
+        for (String s : set) {
+            i++;
+            System.out.println("CURRENT FILE >> " + s);
+            if (i == id){
+                path = Paths.get(s);
+                System.out.println("SUCCESS >> " + path.toString());
+            }
+        }
+        return path;
+    }
+
+}

src/main/java/ru/molokoin/storage/beans/Storage.java

@@ -1,4 +1,4 @@
-package ru.molokoin.storage.services;
+package ru.molokoin.storage.beans;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,21 +6,34 @@ import java.util.List;
 import jakarta.ejb.Singleton;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import jakarta.ws.rs.core.Response;
 import ru.molokoin.storage.entities.ContentEntity;
 
 @Singleton
 public class Storage implements StorageFace{
-    @PersistenceContext (unitName="Storage")
+    @PersistenceContext (unitName="default")
     private EntityManager em;
 
+    @Override
+    public <T> List<T> findAll(Class<T> clazz) {
+        CriteriaBuilder cb = em.getCriteriaBuilder();
+        CriteriaQuery<T> cq = cb.createQuery(clazz);
+        //Metamodel m = em.getMetamodel();
+        Root<T> obj = cq.from(clazz);
+        return em.createQuery(cq.select(obj)).getResultList();
+    }
+
     @Override
     public List<ContentEntity> getInfo() {
-        List<ContentEntity> list = new ArrayList<>();
         System.out.println("getInfo()");
         //Обращаемся к базе и запрашиваем сведения
-        
+        String sql = "SELECT id, filename, location FROM Storage";
-
+        Query query = em.createNativeQuery(sql, ContentEntity.class);
+        List<ContentEntity> list = query.getResultList();
         return list;
     }
 

src/main/java/ru/molokoin/storage/beans/StorageFace.java

@@ -1,4 +1,4 @@
-package ru.molokoin.storage.services;
+package ru.molokoin.storage.beans;
 
 import java.util.List;
 
@@ -12,6 +12,8 @@ import ru.molokoin.storage.entities.ContentEntity;
  */
 @Local
 public interface StorageFace {
+
+    <T> List<T> findAll(Class<T> clazz);
     /**
      * Коллекция сведений о файлах, доступных в хранилице
      * полученная из базы данных

src/main/java/ru/molokoin/storage/entities/ContentEntity.java

@@ -17,7 +17,7 @@ import jakarta.xml.bind.annotation.XmlRootElement;
  */
 @Entity
 @XmlRootElement(name = "storage")
-@Table(name = "Storage", schema = "home", catalog = "")//поправить схему
+@Table(name = "Storage", schema = "home", catalog = "")//поправить схему?
 public class ContentEntity implements Serializable{
     @Id //уникальный идентификатор строки
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -33,8 +33,6 @@ public class ContentEntity implements Serializable{
     @Column(name = "location", length = 1000)
     String location; //Путь к файлу на локальной машине
 
-    byte[] content; //массив байткода - содержимое файла
-
     public Long getId() {
         return id;
     }
@@ -59,14 +57,6 @@ public class ContentEntity implements Serializable{
         this.location = location;
     }
 
-    public byte[] getContent() {
-        return content;
-    }
-
-    public void setContent(byte[] content) {
-        this.content = content;
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;

src/main/resources/META-INF/persistence.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0" xsi:schemalocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
-    <persistence-unit name="Storage" transaction-type="JTA">
+    <persistence-unit name="default" transaction-type="JTA">
         <description>Подключение к базе molokoin.ru:3306/home</description>
         <jta-data-source>java:/home</jta-data-source>
         <class>ru.molokoin.storage.entities.ContentEntity</class>

target/classes/META-INF/persistence.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0" xsi:schemalocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
-    <persistence-unit name="Storage" transaction-type="JTA">
+    <persistence-unit name="default" transaction-type="JTA">
         <description>Подключение к базе molokoin.ru:3306/home</description>
         <jta-data-source>java:/home</jta-data-source>
         <class>ru.molokoin.storage.entities.ContentEntity</class>

target/maven-archiver/pom.properties

@@ -0,0 +1,4 @@
+#Created by Apache Maven 3.8.5
+groupId=ru.molokoin
+artifactId=storage
+version=1.0

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,6 @@
+ru\molokoin\storage\entities\ContentEntity.class
+ru\molokoin\storage\beans\StorageFace.class
+ru\molokoin\storage\api\RestStorageService.class
+ru\molokoin\storage\api\RestConfig.class
+ru\molokoin\storage\beans\HardDrive.class
+ru\molokoin\storage\beans\Storage.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,6 @@
+C:\Users\Strannik\Documents\esoe\code\storage\src\main\java\ru\molokoin\storage\beans\Storage.java
+C:\Users\Strannik\Documents\esoe\code\storage\src\main\java\ru\molokoin\storage\beans\StorageFace.java
+C:\Users\Strannik\Documents\esoe\code\storage\src\main\java\ru\molokoin\storage\entities\ContentEntity.java
+C:\Users\Strannik\Documents\esoe\code\storage\src\main\java\ru\molokoin\storage\api\RestConfig.java
+C:\Users\Strannik\Documents\esoe\code\storage\src\main\java\ru\molokoin\storage\beans\HardDrive.java
+C:\Users\Strannik\Documents\esoe\code\storage\src\main\java\ru\molokoin\storage\api\RestStorageService.java

target/storage/WEB-INF/classes/META-INF/persistence.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0" xsi:schemalocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
+    <persistence-unit name="default" transaction-type="JTA">
+        <description>Подключение к базе molokoin.ru:3306/home</description>
+        <jta-data-source>java:/home</jta-data-source>
+        <class>ru.molokoin.storage.entities.ContentEntity</class>
+        <exclude-unlisted-classes>true</exclude-unlisted-classes>
+    </persistence-unit>
+</persistence>

target/storage/WEB-INF/web.xml

@@ -0,0 +1,7 @@
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd" >
+
+<web-app>
+  <display-name>Archetype Created Web Application</display-name>
+</web-app>

target/storage/index.jsp

@@ -0,0 +1,5 @@
+<html>
+<body>
+<h2>Hello World!</h2>
+</body>
+</html>