iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Ahmed Tawila 2017-08-12 15:40:32 +02:00 committed by GitHub
commit 696d056b9a
9 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/src/test/java/com/baeldung/eclipsecollections/CollectPatternTest.java
View File

@ -2,7 +2,6 @@ package com.baeldung.eclipsecollections;
import org.eclipse.collections.api.list.MutableList; import org.eclipse.collections.api.list.MutableList;
import org.eclipse.collections.impl.list.mutable.FastList; import org.eclipse.collections.impl.list.mutable.FastList;
import static org.junit.Assert.assertEquals;
import org.assertj.core.api.Assertions; import org.assertj.core.api.Assertions;
import org.junit.Test; import org.junit.Test;

1
libraries/src/test/java/com/baeldung/eclipsecollections/FlatCollectTest.java
View File

@ -3,7 +3,6 @@ package com.baeldung.eclipsecollections;
import org.assertj.core.api.Assertions; import org.assertj.core.api.Assertions;
import org.eclipse.collections.api.list.MutableList; import org.eclipse.collections.api.list.MutableList;
import org.eclipse.collections.impl.list.mutable.FastList; import org.eclipse.collections.impl.list.mutable.FastList;
import static org.junit.Assert.assertEquals;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

1
libraries/src/test/java/com/baeldung/eclipsecollections/ZipTest.java
View File

@ -4,7 +4,6 @@ import org.eclipse.collections.api.list.MutableList;
import org.eclipse.collections.api.tuple.Pair; import org.eclipse.collections.api.tuple.Pair;
import org.eclipse.collections.impl.factory.Lists; import org.eclipse.collections.impl.factory.Lists;
import org.eclipse.collections.impl.tuple.Tuples; import org.eclipse.collections.impl.tuple.Tuples;
import static org.junit.Assert.assertEquals;
import org.assertj.core.api.Assertions; import org.assertj.core.api.Assertions;
import org.junit.Before; import org.junit.Before;

2
libraries/src/test/java/com/baeldung/eclipsecollections/ZipWithIndexTest.java
View File

@ -1,7 +1,5 @@
package com.baeldung.eclipsecollections; package com.baeldung.eclipsecollections;
import static org.junit.Assert.assertEquals;
import org.assertj.core.api.Assertions; import org.assertj.core.api.Assertions;
import org.eclipse.collections.api.list.MutableList; import org.eclipse.collections.api.list.MutableList;
import org.eclipse.collections.api.tuple.Pair; import org.eclipse.collections.api.tuple.Pair;

4
spring-boot/pom.xml
View File

@ -52,7 +52,7 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <!-- <dependency>
<groupId>org.apache.tomcat.embed</groupId> <groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId> <artifactId>tomcat-embed-core</artifactId>
<version>${tomcat.version}</version> <version>${tomcat.version}</version>
@ -62,7 +62,7 @@
<groupId>org.apache.tomcat.embed</groupId> <groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-jasper</artifactId> <artifactId>tomcat-embed-jasper</artifactId>
<version>${tomcat.version}</version> <version>${tomcat.version}</version>
</dependency> </dependency> -->
<dependency> <dependency>
<groupId>io.dropwizard.metrics</groupId> <groupId>io.dropwizard.metrics</groupId>

2
spring-boot/src/main/java/com/baeldung/servlets/props/PropertySourcesLoader.java
View File

@ -9,7 +9,7 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.ConfigurableEnvironment;
@Configuration @Configuration
@ComponentScan(basePackages = { "com.baeldung.*" }) @ComponentScan(basePackages = { "com.baeldung.servlets.*" })
@PropertySource("classpath:custom.properties") public class PropertySourcesLoader { @PropertySource("classpath:custom.properties") public class PropertySourcesLoader {
private static final Logger log = LoggerFactory.getLogger(PropertySourcesLoader.class); private static final Logger log = LoggerFactory.getLogger(PropertySourcesLoader.class);

4
spring-boot/src/main/java/com/baeldung/utils/Application.java → spring-boot/src/main/java/com/baeldung/utils/UtilsApplication.java
View File

@ -10,11 +10,11 @@ import com.baeldung.autoconfiguration.MySQLAutoconfiguration;
@SpringBootApplication(exclude=MySQLAutoconfiguration.class) @SpringBootApplication(exclude=MySQLAutoconfiguration.class)
@ComponentScan(basePackages="com.baeldung.utils") @ComponentScan(basePackages="com.baeldung.utils")
public class Application { public class UtilsApplication {
@RolesAllowed("*") @RolesAllowed("*")
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(Application.class, args); SpringApplication.run(UtilsApplication.class, args);
} }
} }

4
spring-boot/src/main/webapp/WEB-INF/context.xml
View File

@ -6,7 +6,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-4.3.xsd"> http://www.springframework.org/schema/context/spring-context-4.3.xsd">
<context:component-scan base-package="com.baeldung"/> <context:component-scan base-package="com.baeldung.servlets"/>
<bean class="com.baeldung.configuration.WebAppInitializer"/> <bean class="com.baeldung.servlets.configuration.WebAppInitializer"/>
</beans> </beans>

2
spring-boot/src/main/webapp/WEB-INF/dispatcher.xml
View File

@ -7,7 +7,7 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd"> http://www.springframework.org/schema/context/spring-context-3.0.xsd">
<context:component-scan base-package="com.baeldung"/> <context:component-scan base-package="com.baeldung.servlets"/>
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver"> <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
<property name="prefix" value="/WEB-INF/jsp/"/> <property name="prefix" value="/WEB-INF/jsp/"/>