lesson 8.

Устранение ошибок: 1. Реализация doRead в AbstarctFileStorage 2.ALT+L 3. обработка null из listFiles() в AbstractFileStoradge.doCopyAll

Author: AlbertoJava

src/com/urise/webapp/MainDate.java

@@ -4,15 +4,14 @@
 importjava.time.LocalDate;
 importjava.util.Calendar;
 importjava.util.Date;
-importjava.util.Locale;
 
 publicclassMainDate{
 publicstaticvoidmain(String[] args){
-Datedate= newDate();
+Datedate= newDate();
 System.out.println(date.getTime());
 Calendarcal = Calendar.getInstance();
 System.out.println(cal.getTime());
-LocalDateld= LocalDate.now();
+LocalDateld= LocalDate.now();
 SimpleDateFormatsdf = newSimpleDateFormat("YY/MM/dd");
 System.out.println(sdf.format(cal.getTime()));
 

src/com/urise/webapp/exception/StorageException.java

@@ -1,7 +1,5 @@
 packagecom.urise.webapp.exception;
 
-importjava.io.IOException;
-
 publicclassStorageExceptionextendsRuntimeException{
 privatefinalStringuuid;
 
@@ -11,7 +9,7 @@ public StorageException(String message, String uuid){
  }
 
 publicStorageException(Stringmessage, Stringuuid, Exceptione){
-super(message,e);
+super(message,e);
 this.uuid = uuid;
 
  }

src/com/urise/webapp/model/Link.java

@@ -7,7 +7,7 @@ public class Link{
 privatefinalStringurl;
 
 publicLink(Stringname, Stringurl){
-Objects.requireNonNull(name,"name must not be null");
+Objects.requireNonNull(name,"name must not be null");
 this.name = name;
 this.url = url;
  }
@@ -22,7 +22,7 @@ public String getUrl(){
 
 @Override
 publicStringtoString(){
-return"Link ("+ name + ',' + url + ')';
+return"Link ("+ name + ',' + url + ')';
  }
 
 @Override

src/com/urise/webapp/model/ListSection.java

@@ -7,7 +7,7 @@ public class ListSection extends AbstractSection{
 privatefinalList<String> items;
 
 publicListSection(List<String> items){
-Objects.requireNonNull(items,"items must not null");
+Objects.requireNonNull(items,"items must not null");
 this.items = items;
  }
 

src/com/urise/webapp/model/OrganizationSection.java

@@ -7,7 +7,7 @@ public class OrganizationSection extends AbstractSection{
 privatefinalList<Organization> organizations;
 
 publicOrganizationSection(List<Organization> organizations){
-Objects.requireNonNull(organizations,"organizations must not null");
+Objects.requireNonNull(organizations,"organizations must not null");
 this.organizations = organizations;
  }
 

src/com/urise/webapp/model/Resume.java

@@ -1,6 +1,9 @@
 packagecom.urise.webapp.model;
 
-importjava.util.*;
+importjava.util.EnumMap;
+importjava.util.Map;
+importjava.util.Objects;
+importjava.util.UUID;
 
 /**
  * Initial resume class
@@ -26,6 +29,7 @@ public Resume(String uuid, String fullName){
 this.fullName = fullName;
  }
 
+<<<<<<< HEAD
 
 publicStringgetContact (ContactTypetype){
 returncontacts.get(type);
@@ -41,6 +45,22 @@ public void addSection (SectionType type, AbstractSection section){
 
 publicvoidaddContact (ContactTypetype, Stringcontact){
 contacts.put(type,contact);
+=======
+publicStringgetContact(ContactTypetype){
+returncontacs.get(type);
+ }
+
+publicSectiongetSection(SectionTypetype){
+returnsections.get(type);
+ }
+
+publicvoidaddSection(SectionTypetype, Sectionsection){
+sections.put(type, section);
+ }
+
+publicvoidaddContact(ContactTypetype, Stringcontact){
+contacs.put(type, contact);
+>>>>>>> lesson8.
  }
 
 

src/com/urise/webapp/model/SectionType.java

@@ -1,12 +1,12 @@
 packagecom.urise.webapp.model;
 
 publicenumSectionType{
-PERSONAL("Личные качества"),
-OBJECTIVE("Позиция"),
-ACHIEVEMENT("Достижения"),
-QUALIFICATIONS("Квалификация"),
-EXPIRIENCE("Опыт работы"),
-EDUCATION("Образование");
+PERSONAL("Личные качества"),
+OBJECTIVE("Позиция"),
+ACHIEVEMENT("Достижения"),
+QUALIFICATIONS("Квалификация"),
+EXPIRIENCE("Опыт работы"),
+EDUCATION("Образование");
 
 privateStringtitle;
 

src/com/urise/webapp/model/TextSection.java

@@ -6,7 +6,7 @@ public class TextSection extends AbstractSection{
 privatefinalStringcontent;
 
 publicTextSection(Stringcontent){
-Objects.requireNonNull(content,"content must not null");
+Objects.requireNonNull(content,"content must not null");
 this.content = content;
  }
 

src/com/urise/webapp/storage/AbstractFileStorage.java

@@ -13,38 +13,38 @@ public abstract class AbstractFileStorage extends AbstractStorage{
 privateFiledirectory;
 
 protectedAbstractFileStorage(Filedirectory){
-Objects.requireNonNull(directory,"directory must not null");
-if (directory.isDirectory()){
-thrownewIllegalArgumentException(directory.getAbsolutePath() + " is not directory");
+Objects.requireNonNull(directory,"directory must not null");
+if (directory.isDirectory()){
+thrownewIllegalArgumentException(directory.getAbsolutePath() + " is not directory");
  }
-if (directory.canRead()||directory.canWrite()){
-thrownewIllegalArgumentException(directory.getAbsolutePath() + " is not readable/writable");
+if (directory.canRead() || directory.canWrite()){
+thrownewIllegalArgumentException(directory.getAbsolutePath() + " is not readable/writable");
  }
-this.directory=directory;
+this.directory = directory;
  }
 
 @Override
 protectedvoiddoUpdate(Resumeresume, ObjectsearchKey){
 //как doSave только в существующий
-Filef = (File)searchKey;
+Filef = (File)searchKey;
 try{
-doWrite(resume,f);
+doWrite(resume,f);
  } catch (IOExceptione){
 thrownewStorageException("IO error", f.getName(), e);
  }
  }
 
 @Override
 protectedbooleanisExist(Objectfile){
-return ((File)file).exists();
+return ((File)file).exists();
  }
 
 @Override
 protectedvoiddoSave(Resumeresume, Objectfile){
-Filef =((File)file);
+Filef =((File)file);
 try{
 f.createNewFile();
-doWrite(resume,f);
+doWrite(resume,f);
  } catch (IOExceptione){
 thrownewStorageException("IO error", f.getName(), e);
  }
@@ -54,35 +54,31 @@ protected void doSave(Resume resume, Object file){
 
 @Override
 protectedResumedoGet(ObjectsearchKey){
-//абстрактный останется
-
-
-returnnull;
+returndoRead ((File)searchKey);
  }
 
 @Override
 protectedvoiddoDelete(ObjectsearchKey){
-Filef= (File)searchKey;
+Filef= (File)searchKey;
 f.delete();
 //удаляет файл
  }
 
 @Override
 protectedObjectgetSearchKey(Stringuuid){
-returnnewFile(directory,uuid);
+returnnewFile(directory,uuid);
  }
 
 @Override
 protectedList<Resume> doCopyAll(){
 //читает все файлы и делает do Read и возвращает list
-List<Resume> resumes = newArrayList<>();
-try{
-for (Filef : directory.listFiles()){
-resumes.add(doRead(f));
- }
+File[] arrFiles = directory.listFiles();
+if (arrFiles == null){
+thrownewStorageException("Resume files not founded in directory " + directory.getAbsolutePath() , "");
  }
-catch (NullPointerExceptione){
-thrownewStorageException("FileStorage got empty list of files","",e);
+List<Resume> resumes = newArrayList<>();
+for (Filef : arrFiles){
+resumes.add(doRead(f));
  }
 returnresumes;
  }
@@ -92,7 +88,7 @@ protected List<Resume> doCopyAll(){
 @Override
 publicvoidclear(){
 //получить все файлыиз каталога и удалить
-for (Filef:
+for (Filef:
 directory.listFiles()){
 f.delete();
  }

src/com/urise/webapp/storage/MainFile.java

@@ -14,14 +14,18 @@ public static void main(String[] args){
  }
  }
 
-publicstaticvoidfindFiles(Filefile) throwsIOException{
+publicstaticvoidfindFiles(Filefile) throwsIOException{
 if (file.isDirectory()){
 File[] list = file.listFiles();
+<<<<<<< HEAD
 if (list==null){
 System.out.println("Files not found!");
 return;
  }
 for (inti=list.length; --i>=0;){
+=======
+for (inti = list.length; --i >= 0; ){
+>>>>>>> lesson8.
 findFiles(list[i]);
  }
  } else{