Refactor upcase

.gitignore

@@ -15,4 +15,5 @@ buildNumber.properties
 *.tsv
 *.csv
 *.class
-hs_err_pid*
+hs_err_pid*
+/drc/

pom.xml

@@ -5,7 +5,6 @@
 	<artifactId>upcase</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>war</packaging>
-
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -20,7 +19,6 @@
 		<lucene.version>5.4.1</lucene.version>
 		<nosqlunit-version>0.8.1</nosqlunit-version>
 	</properties>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.thymeleaf.extras</groupId>
@@ -37,11 +35,11 @@
 		<!-- <artifactId>javax.servlet-api</artifactId> -->
 		<!-- <version>3.1.0</version> -->
 		<!-- </dependency> -->
-		<dependency>
-			<groupId>org.springframework.webflow</groupId>
-			<artifactId>spring-webflow</artifactId>
-			<version>2.4.2.RELEASE</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.springframework.webflow</groupId> -->
+<!-- 			<artifactId>spring-webflow</artifactId> -->
+<!-- 			<version>2.4.2.RELEASE</version> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>com.lordofthejars</groupId>
 			<artifactId>nosqlunit-mongodb</artifactId>
@@ -56,7 +54,7 @@
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-mongodb</artifactId>
-			<version>1.8.0.RELEASE</version>
+			<version>1.9.2.RELEASE</version>
 		</dependency>
 		<!-- <dependency> -->
 		<!-- <groupId>javax.servlet</groupId> -->
@@ -68,11 +66,11 @@
 			<artifactId>javax.servlet-api</artifactId>
 			<version>3.0.1</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-fileupload</groupId>
-			<artifactId>commons-fileupload</artifactId>
-			<version>1.2.2</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>commons-fileupload</groupId> -->
+<!-- 			<artifactId>commons-fileupload</artifactId> -->
+<!-- 			<version>1.2.2</version> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
@@ -114,11 +112,11 @@
 			<version>${spring.version}</version>
 			<optional>false</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.data</groupId>
-			<artifactId>spring-data-jpa</artifactId>
-			<version>1.9.0.RELEASE</version>
-		</dependency>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.springframework.data</groupId> -->
+<!-- 			<artifactId>spring-data-jpa</artifactId> -->
+<!-- 			<version>1.9.0.RELEASE</version> -->
+<!-- 		</dependency> -->
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-core</artifactId>
@@ -229,20 +227,33 @@
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
-			<version>1.3.1</version>
+			<version>1.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
 			<version>2.4</version>
 		</dependency>
-		<!-- https://mvnrepository.com/artifact/org.jsoup/jsoup -->
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
 			<version>1.8.3</version>
 		</dependency>
-
+		<dependency>
+			<groupId>de.flapdoodle.embed</groupId>
+			<artifactId>de.flapdoodle.embed.mongo</artifactId>
+			<version>1.50.5</version>
+		</dependency>
+		<dependency>
+			<groupId>com.jcraft</groupId>
+			<artifactId>jsch</artifactId>
+			<version>0.1.53</version>
+		</dependency>
+		<dependency>
+			<groupId>net.sourceforge.tess4j</groupId>
+			<artifactId>tess4j</artifactId>
+			<version>3.2.1</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

src/main/java/de/uni_koeln/spinfo/upcase/CollectionAlreadyExistsException.java

@@ -0,0 +1,15 @@
+package de.uni_koeln.spinfo.upcase;
+
+public class CollectionAlreadyExistsException extends Exception {
+
+	private static final long serialVersionUID = 1487724146570813552L;
+
+	public CollectionAlreadyExistsException() {
+		super("Collection already exists...");
+	}
+
+	public CollectionAlreadyExistsException(String arg) {
+		super("Collection with " + arg + " name already exists...");
+	}
+
+}

src/main/java/de/uni_koeln/spinfo/upcase/config/MongoDbConfig.java

@@ -31,7 +31,7 @@
 import com.mongodb.ServerAddress;
 
 @Configuration
-@EnableMongoRepositories
+@EnableMongoRepositories(basePackages = "de.uni_koeln.spinfo.upcase.mongodb.repository")
 @PropertySource("classpath:database.properties")
 public class MongoDbConfig extends AbstractMongoConfiguration {
 

src/main/java/de/uni_koeln/spinfo/upcase/config/PostDbHandler.java

@@ -0,0 +1,51 @@
+package de.uni_koeln.spinfo.upcase.config;
+
+import java.util.Collection;
+
+import javax.annotation.PostConstruct;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.stereotype.Component;
+
+import de.uni_koeln.spinfo.upcase.mongodb.data.document.future.UpcaseUser;
+import de.uni_koeln.spinfo.upcase.mongodb.repository.future.UpcaseUserRepository;
+import de.uni_koeln.spinfo.upcase.security.MyInMemoryUserDetailsManager;
+
+@Component
+public class PostDbHandler {
+
+	Logger logger = LoggerFactory.getLogger(getClass());
+
+	@Autowired
+	private MyInMemoryUserDetailsManager inMemoryUserDetailsManager;
+
+	@Autowired
+	private UpcaseUserRepository upcaseUserRepository;
+
+	@Autowired
+	private MongoTemplate template;
+
+	@PostConstruct
+	public void postContruct() {
+
+		Collection<UserDetails> users = inMemoryUserDetailsManager.getUsers();
+
+		for (UserDetails userDetails : users) {
+			if (userDetails instanceof UpcaseUser) {
+				UpcaseUser user = (UpcaseUser) userDetails;
+				UpcaseUser findByEmail = upcaseUserRepository.findByEmail(user.getEmail());
+				if (findByEmail == null) {
+					user = upcaseUserRepository.save(user);
+					logger.info(user + " ID :: " + user.getId());
+				}
+			}
+		}
+		long count = template.getCollection("ref_users").count();
+		logger.info("UpcaseUser :: " + count);
+	}
+
+}

src/main/java/de/uni_koeln/spinfo/upcase/config/SecurityConfig.java

@@ -1,14 +1,25 @@
 package de.uni_koeln.spinfo.upcase.config;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
+import de.uni_koeln.spinfo.upcase.model.form.RegistrationForm;
+import de.uni_koeln.spinfo.upcase.mongodb.data.document.future.UpcaseUser;
+import de.uni_koeln.spinfo.upcase.security.MyInMemoryUserDetailsManager;
+
 @Configuration
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)
@@ -17,14 +28,39 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	// @formatter:off
 	@Autowired
 	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-		auth.inMemoryAuthentication().withUser("editor").password("editor").roles("USER");
-		auth.inMemoryAuthentication().withUser("guest").password("guest").roles("USER");
-		auth.inMemoryAuthentication().withUser("user").password("user").roles("USER");
-		auth.inMemoryAuthentication().withUser("admin").password("admin").roles("ADMIN");
-		auth.inMemoryAuthentication().withUser("superuser").password("superuser").roles("USER", "ADMIN");
-		auth.inMemoryAuthentication().withUser("god").password("god").roles("USER", "ADMIN", "CREATER");
+		auth.userDetailsService(inMemoryUserDetailsManager());
+//		auth.inMemoryAuthentication().withUser("user").password("user").roles("USER");
+//		auth.inMemoryAuthentication().withUser("admin").password("admin").roles("ADMIN");
 	}
 
+	@Bean
+    public MyInMemoryUserDetailsManager inMemoryUserDetailsManager() {
+
+		Collection<UserDetails> users = new ArrayList<>();
+
+		UpcaseUser upcaseUser1 = new UpcaseUser(new RegistrationForm("Mihail", "Atanassov", "matanass@uni-koeln.de", "Department of Computational Linguistics", "matana123", "matana123"));
+		UpcaseUser upcaseUser2 = new UpcaseUser(new RegistrationForm("Claes", "Neuefeind", "claesn@uni-koeln.de", "Department of Computational Linguistics", "claesn123", "claesn123"));
+		UpcaseUser upcaseUser3 = new UpcaseUser(new RegistrationForm("Guest", "Guest", "guest", "", "guest", "guest"));
+		List<GrantedAuthority> authorities = new ArrayList<>();
+		authorities.add(new GrantedAuthority() {
+
+			private static final long serialVersionUID = 1L;
+
+			@Override
+			public String getAuthority() {
+				return "ROLE_ADMIN";
+			}
+		});
+		UpcaseUser upcaseUser4 = new UpcaseUser(new RegistrationForm("Admin", "Admin", "admin", "", "admin", "admin"), true, true, true, true, authorities);
+
+		users.add(upcaseUser1);
+		users.add(upcaseUser2);
+		users.add(upcaseUser3);
+		users.add(upcaseUser4);
+
+        return  new MyInMemoryUserDetailsManager(users);
+    }
+
 	@Override
 	public void configure(HttpSecurity http) throws Exception {
 		http
@@ -45,7 +81,7 @@ public void configure(HttpSecurity http) throws Exception {
 			.logoutSuccessUrl("/")
 		.and()
 			.exceptionHandling()
-			.accessDeniedPage("/access_denied")
+			.accessDeniedPage("/something_went_wrong")
 		.and()
 			.logout()
 			.logoutRequestMatcher(new AntPathRequestMatcher("/logout"))

src/main/java/de/uni_koeln/spinfo/upcase/config/ThymeLeafConfig.java

@@ -7,6 +7,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ResourceBundleMessageSource;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@@ -48,7 +49,7 @@ public ServletContextTemplateResolver templateResolver() {
 	}
 
 	@Bean
-	public SpringTemplateEngine templateEngine() {	
+	public SpringTemplateEngine templateEngine() {
 		SpringTemplateEngine engine = new SpringTemplateEngine();
 		engine.setTemplateResolver(templateResolver());
 		Set<IDialect> dialetcs = new HashSet<>();
@@ -72,13 +73,13 @@ public MessageSource messageSource() {
 		messageSource.setBasename("locale/messages");
 		return messageSource;
 	}
-	
-	@Bean
-	public CommonsMultipartResolver multipartResolver() {
+
+	@Bean(name = "filterMultipartResolver")
+	public CommonsMultipartResolver filterMultipartResolver() {
 		CommonsMultipartResolver resolver = new CommonsMultipartResolver();
-		resolver.setMaxUploadSize(104857600);
+		resolver.setMaxUploadSize(-1);
 		resolver.setDefaultEncoding("UTF-8");
 		return resolver;
 	}
-	
+
 }