Skip to content

Commit

Permalink
Fix typo and remove unused import
Browse files Browse the repository at this point in the history
  • Loading branch information
yyvess committed Sep 9, 2017
1 parent abf426d commit 6758d60
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 24 deletions.
35 changes: 13 additions & 22 deletions src/main/java/net/jmob/jsconf/core/ConfigurationFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,15 @@

package net.jmob.jsconf.core;

import static java.lang.String.format;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;

import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
import com.typesafe.config.ConfigSyntax;
import net.jmob.jsconf.core.impl.BeanDefinition;
import net.jmob.jsconf.core.impl.BeanFactory;
import net.jmob.jsconf.core.impl.ProxyPostProcessor;
import net.jmob.jsconf.core.service.ClassPathScanningCandidate;
import net.jmob.jsconf.core.service.WatchResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
Expand All @@ -37,19 +36,12 @@
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.type.filter.AnnotationTypeFilter;

import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigParseOptions;
import com.typesafe.config.ConfigSyntax;
import java.util.*;
import java.util.Map.Entry;

import net.jmob.jsconf.core.impl.BeanDefinition;
import net.jmob.jsconf.core.impl.BeanFactory;
import net.jmob.jsconf.core.impl.ProxyPostProcessor;
import net.jmob.jsconf.core.service.ClassPathScanningCandidate;
import net.jmob.jsconf.core.service.WatchResource;
import static java.lang.String.format;

public class ConfigurationFactory implements ApplicationContextAware, BeanFactoryPostProcessor, BeanPostProcessor {

Expand Down Expand Up @@ -228,13 +220,12 @@ private void clearContext() {
this.proxyBeanName.clear();
}

private String registerBean(BeanFactory beanBuilder) {
private void registerBean(BeanFactory beanBuilder) {
String beanId = beanBuilder.registerBean();
if (beanBuilder.isReloading()) {
this.proxyBeanName.add(beanId);
}
this.beanName.add(beanId);
return beanId;
}

private List<String> withProfile(String name) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/jmob/jsconf/core/impl/BeanValidator.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ class BeanValidator {
ValidatorFactory f = null;
try {
f = Validation.buildDefaultValidatorFactory();
log.debug("Vadliation factory builded");
log.debug("Validation factory builded");
} catch (ValidationException e) {
log.debug("No vadliation factory found in classpath");
log.debug("No validation factory found in classpath");
} finally {
factory = f;
}
Expand Down

0 comments on commit 6758d60

Please sign in to comment.