iSharkFly-Open/Java-Tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/eugenp/master' into XStream-ObjectToJson

Browse Source
This commit is contained in:
ankur-singhal
2016-04-08 21:00:14 +05:30
parent ae57f05a54 d575f443bc
commit 63f1bd7665
97 changed files with 1590 additions and 660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core-java-8/src/main/java/com/baeldung/unzip/UnzipFile.java
+8 -9
View File
@@ -2,27 +2,26 @@ package com.baeldung.unzip;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
public class UnzipFile {
public static void main(String[] args) throws FileNotFoundException, IOException {
String fileZip = "/opt/zipped/cities.zip";
byte[] buffer = new byte[1024];
ZipInputStream zis = new ZipInputStream(new FileInputStream(fileZip));
public static void main(final String[] args) throws IOException {
final String fileZip = "src/main/resources/compressed.zip";
final byte[] buffer = new byte[1024];
final ZipInputStream zis = new ZipInputStream(new FileInputStream(fileZip));
ZipEntry zipEntry = zis.getNextEntry();
while(zipEntry != null){
String fileName = zipEntry.getName();
File newFile = new File("/opt/unzipped/" + fileName);
FileOutputStream fos = new FileOutputStream(newFile);
final String fileName = zipEntry.getName();
final File newFile = new File("src/main/resources/unzipTest/" + fileName);
final FileOutputStream fos = new FileOutputStream(newFile);
int len;
while ((len = zis.read(buffer)) > 0) {
fos.write(buffer, 0, len);
}
fos.close();
fos.close();
zipEntry = zis.getNextEntry();
}
zis.closeEntry();
core-java-8/src/main/java/com/baeldung/zip/ZipDirectory.java
+43
View File
@@ -0,0 +1,43 @@
package com.baeldung.zip;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
public class ZipDirectory {
public static void main(final String[] args) throws IOException {
final String sourceFile = "src/main/resources/zipTest";
final FileOutputStream fos = new FileOutputStream("src/main/resources/dirCompressed.zip");
final ZipOutputStream zipOut = new ZipOutputStream(fos);
final File fileToZip = new File(sourceFile);
zipFile(fileToZip, fileToZip.getName(), zipOut);
zipOut.close();
fos.close();
}
private static void zipFile(final File fileToZip, final String fileName, final ZipOutputStream zipOut) throws IOException {
if (fileToZip.isHidden()) {
return;
}
if (fileToZip.isDirectory()) {
final File[] children = fileToZip.listFiles();
for (final File childFile : children) {
zipFile(childFile, fileName + "/" + childFile.getName(), zipOut);
}
return;
}
final FileInputStream fis = new FileInputStream(fileToZip);
final ZipEntry zipEntry = new ZipEntry(fileName);
zipOut.putNextEntry(zipEntry);
final byte[] bytes = new byte[1024];
int length;
while ((length = fis.read(bytes)) >= 0) {
zipOut.write(bytes, 0, length);
}
fis.close();
}
}
core-java-8/src/main/java/com/baeldung/zip/ZipFile.java
+8 -9
View File
@@ -2,22 +2,21 @@ package com.baeldung.zip;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
public class ZipFile {
public static void main(String[] args) throws FileNotFoundException, IOException {
String sourceFile = "/opt/photos/photo.png";
FileOutputStream fos = new FileOutputStream("/opt/zipped/cities.zip");
ZipOutputStream zipOut = new ZipOutputStream(fos);
File fileToZip = new File(sourceFile);
FileInputStream fis = new FileInputStream(fileToZip);
ZipEntry zipEntry = new ZipEntry(fileToZip.getName());
public static void main(final String[] args) throws IOException {
final String sourceFile = "src/main/resources/zipTest/test1.txt";
final FileOutputStream fos = new FileOutputStream("src/main/resources/compressed.zip");
final ZipOutputStream zipOut = new ZipOutputStream(fos);
final File fileToZip = new File(sourceFile);
final FileInputStream fis = new FileInputStream(fileToZip);
final ZipEntry zipEntry = new ZipEntry(fileToZip.getName());
zipOut.putNextEntry(zipEntry);
byte[] bytes = new byte[1024];
final byte[] bytes = new byte[1024];
int length;
while((length = fis.read(bytes)) >= 0) {
zipOut.write(bytes, 0, length);
core-java-8/src/main/java/com/baeldung/zip/ZipMultipleFiles.java
+33
View File
@@ -0,0 +1,33 @@
package com.baeldung.zip;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
public class ZipMultipleFiles {
public static void main(final String[] args) throws IOException {
final List<String> srcFiles = Arrays.asList("src/main/resources/zipTest/test1.txt", "src/main/resources/zipTest/test2.txt");
final FileOutputStream fos = new FileOutputStream("src/main/resources/multiCompressed.zip");
final ZipOutputStream zipOut = new ZipOutputStream(fos);
for (final String srcFile : srcFiles) {
final File fileToZip = new File(srcFile);
final FileInputStream fis = new FileInputStream(fileToZip);
final ZipEntry zipEntry = new ZipEntry(fileToZip.getName());
zipOut.putNextEntry(zipEntry);
final byte[] bytes = new byte[1024];
int length;
while((length = fis.read(bytes)) >= 0) {
zipOut.write(bytes, 0, length);
}
fis.close();
}
zipOut.close();
fos.close();
}
}
core-java-8/src/main/resources/compressed.zip
BIN
View File
Binary file not shown.
core-java-8/src/main/resources/dirCompressed.zip
BIN
View File
Binary file not shown.
core-java-8/src/main/resources/multiCompressed.zip
BIN
View File
Binary file not shown.
core-java-8/src/main/resources/unzipTest/test1.txt
+1
View File
@@ -0,0 +1 @@
Hello World!
core-java-8/src/main/resources/zipTest/test1.txt
+1
View File
@@ -0,0 +1 @@
Hello World!
core-java-8/src/main/resources/zipTest/test2.txt
+1
View File
@@ -0,0 +1 @@
My Name is John
core-java-8/src/main/resources/zipTest/testFolder/test3.txt
+1
View File
@@ -0,0 +1 @@
My Name is Tom
core-java-8/src/main/resources/zipTest/testFolder/test4.txt
+1
View File
@@ -0,0 +1 @@
My Name is Jane
core-java/src/test/java/org/baeldung/java/io/JavaXToWriterUnitTest.java
+8
View File
@@ -1,5 +1,7 @@
package org.baeldung.java.io;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
@@ -23,6 +25,8 @@ public class JavaXToWriterUnitTest {
final Writer targetWriter = new StringWriter().append(new String(initialArray));
targetWriter.close();
assertEquals("With Java", targetWriter.toString());
}
@Test
@@ -40,6 +44,8 @@ public class JavaXToWriterUnitTest {
charSink.write(buffer);
stringWriter.close();
assertEquals("With Guava", stringWriter.toString());
}
@Test
@@ -48,6 +54,8 @@ public class JavaXToWriterUnitTest {
final Writer targetWriter = new StringBuilderWriter(new StringBuilder(new String(initialArray)));
targetWriter.close();
assertEquals("With Commons IO", targetWriter.toString());
}
}
spring-mvc-java/.classpath
+37 -37
View File
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
spring-mvc-java/pom.xml
+7
View File
@@ -57,6 +57,13 @@
<artifactId>slf4j-log4j12</artifactId>
<version>${org.slf4j.version}</version>
</dependency>
<!-- common -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.1</version>
</dependency>
<!-- test scoped -->
<dependency>
<groupId>junit</groupId>
spring-mvc-java/src/main/java/org/baeldung/aop/LoggingAspect.java → spring-mvc-java/src/main/java/com/baeldung/aop/LoggingAspect.java
+3 -3
View File
@@ -1,4 +1,4 @@
package org.baeldung.aop;
package com.baeldung.aop;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
@@ -27,11 +27,11 @@ public class LoggingAspect {
public void repositoryMethods() {
}
@Pointcut("@annotation(org.baeldung.aop.annotations.Loggable)")
@Pointcut("@annotation(com.baeldung.aop.annotations.Loggable)")
public void loggableMethods() {
}
@Pointcut("@args(org.baeldung.aop.annotations.Entity)")
@Pointcut("@args(com.baeldung.aop.annotations.Entity)")
public void methodsAcceptingEntities() {
}
spring-mvc-java/src/main/java/org/baeldung/aop/PerformanceAspect.java → spring-mvc-java/src/main/java/com/baeldung/aop/PerformanceAspect.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.baeldung.aop;
package com.baeldung.aop;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
spring-mvc-java/src/main/java/org/baeldung/aop/PublishingAspect.java → spring-mvc-java/src/main/java/com/baeldung/aop/PublishingAspect.java
+2 -2
View File
@@ -1,10 +1,10 @@
package org.baeldung.aop;
package com.baeldung.aop;
import com.baeldung.events.FooCreationEvent;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.baeldung.events.FooCreationEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Component;
spring-mvc-java/src/main/java/org/baeldung/aop/annotations/Entity.java → spring-mvc-java/src/main/java/com/baeldung/aop/annotations/Entity.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.baeldung.aop.annotations;
package com.baeldung.aop.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
spring-mvc-java/src/main/java/org/baeldung/aop/annotations/Loggable.java → spring-mvc-java/src/main/java/com/baeldung/aop/annotations/Loggable.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.baeldung.aop.annotations;
package com.baeldung.aop.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
spring-mvc-java/src/main/java/org/baeldung/dao/FooDao.java → spring-mvc-java/src/main/java/com/baeldung/dao/FooDao.java
+3 -3
View File
@@ -1,7 +1,7 @@
package org.baeldung.dao;
package com.baeldung.dao;
import org.baeldung.aop.annotations.Loggable;
import org.baeldung.model.Foo;
import com.baeldung.aop.annotations.Loggable;
import com.baeldung.model.Foo;
import org.springframework.stereotype.Repository;
@Repository
spring-mvc-java/src/main/java/org/baeldung/dialect/CustomDialect.java → spring-mvc-java/src/main/java/com/baeldung/dialect/CustomDialect.java
+2 -2
View File
@@ -1,9 +1,9 @@
package org.baeldung.dialect;
package com.baeldung.dialect;
import java.util.HashSet;
import java.util.Set;
import org.baeldung.processor.NameProcessor;
import com.baeldung.processor.NameProcessor;
import org.thymeleaf.dialect.AbstractDialect;
import org.thymeleaf.processor.IProcessor;
spring-mvc-java/src/main/java/org/baeldung/events/FooCreationEvent.java → spring-mvc-java/src/main/java/com/baeldung/events/FooCreationEvent.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.baeldung.events;
package com.baeldung.events;
import org.springframework.context.ApplicationEvent;
spring-mvc-java/src/main/java/org/baeldung/events/FooCreationEventListener.java → spring-mvc-java/src/main/java/com/baeldung/events/FooCreationEventListener.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.baeldung.events;
package com.baeldung.events;
import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;
spring-mvc-java/src/main/java/org/baeldung/model/Employee.java → spring-mvc-java/src/main/java/com/baeldung/model/Employee.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.baeldung.model;
package com.baeldung.model;
import javax.xml.bind.annotation.XmlRootElement;
spring-mvc-java/src/main/java/org/baeldung/model/Foo.java → spring-mvc-java/src/main/java/com/baeldung/model/Foo.java
+2 -2
View File
@@ -1,6 +1,6 @@
package org.baeldung.model;
package com.baeldung.model;
import org.baeldung.aop.annotations.Entity;
import com.baeldung.aop.annotations.Entity;
@Entity
public class Foo {
spring-mvc-java/src/main/java/org/baeldung/model/User.java → spring-mvc-java/src/main/java/com/baeldung/model/User.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.baeldung.model;
package com.baeldung.model;
public class User {
private String firstname;
spring-mvc-java/src/main/java/org/baeldung/processor/NameProcessor.java → spring-mvc-java/src/main/java/com/baeldung/processor/NameProcessor.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.baeldung.processor;
package com.baeldung.processor;
import org.thymeleaf.Arguments;
import org.thymeleaf.dom.Element;
spring-mvc-java/src/main/java/com/baeldung/spring/web/config/ClientWebConfig.java
+93
View File
@@ -0,0 +1,93 @@
package com.baeldung.spring.web.config;
import java.util.HashSet;
import java.util.Set;
import com.baeldung.dialect.CustomDialect;
import org.springframework.context.MessageSource;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Description;
import org.springframework.context.support.ResourceBundleMessageSource;
import org.springframework.web.servlet.ViewResolver;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.view.InternalResourceViewResolver;
import org.springframework.web.servlet.view.JstlView;
import org.thymeleaf.dialect.IDialect;
import org.thymeleaf.spring4.SpringTemplateEngine;
import org.thymeleaf.spring4.view.ThymeleafViewResolver;
import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
@EnableWebMvc
@Configuration
public class ClientWebConfig extends WebMvcConfigurerAdapter {
public ClientWebConfig() {
super();
}
// API
@Override
public void addViewControllers(final ViewControllerRegistry registry) {
super.addViewControllers(registry);
registry.addViewController("/sample.html");
}
@Bean
public ViewResolver thymeleafViewResolver() {
final ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
viewResolver.setTemplateEngine(templateEngine());
viewResolver.setOrder(1);
return viewResolver;
}
@Bean
public ViewResolver viewResolver() {
final InternalResourceViewResolver bean = new InternalResourceViewResolver();
bean.setViewClass(JstlView.class);
bean.setPrefix("/WEB-INF/view/");
bean.setSuffix(".jsp");
bean.setOrder(0);
return bean;
}
@Bean
@Description("Thymeleaf template resolver serving HTML 5")
public ServletContextTemplateResolver templateResolver() {
final ServletContextTemplateResolver templateResolver = new ServletContextTemplateResolver();
templateResolver.setPrefix("/WEB-INF/templates/");
templateResolver.setSuffix(".html");
templateResolver.setTemplateMode("HTML5");
return templateResolver;
}
@Bean
@Description("Thymeleaf template engine with Spring integration")
public SpringTemplateEngine templateEngine() {
final SpringTemplateEngine templateEngine = new SpringTemplateEngine();
templateEngine.setTemplateResolver(templateResolver());
final Set<IDialect> dialects = new HashSet<>();
dialects.add(new CustomDialect());
templateEngine.setAdditionalDialects(dialects);
return templateEngine;
}
@Bean
@Description("Spring message resolver")
public MessageSource messageSource() {
final ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
messageSource.setBasename("messages");
return messageSource;
}
@Override
public void addResourceHandlers(final ResourceHandlerRegistry registry) {
registry.addResourceHandler("/resources/**").addResourceLocations("/resources/");
}
}
spring-mvc-java/src/main/java/org/baeldung/spring/web/config/ContentManagementWebConfig.java → spring-mvc-java/src/main/java/com/baeldung/spring/web/config/ContentManagementWebConfig.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.baeldung.spring.web.config;
package com.baeldung.spring.web.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

Some files were not shown because too many files have changed in this diff Show More