1
0
mirror of https://github.com/Unleash/unleash.git synced 2025-03-09 00:18:26 +01:00

finn java style fixes, no functional changes

This commit is contained in:
Jari Bakken 2014-10-27 14:02:04 +01:00
parent c22229c205
commit d48869ecd9
12 changed files with 24 additions and 12 deletions

View File

@ -2,6 +2,7 @@ package no.finn.unleash;
import java.util.HashMap;
import java.util.Map;
import no.finn.unleash.repository.ToggleException;
import no.finn.unleash.repository.ToggleRepository;
import no.finn.unleash.strategy.DefaultStrategy;

View File

@ -6,6 +6,7 @@ import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.Collections;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

View File

@ -8,6 +8,7 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import no.finn.unleash.Toggle;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

View File

@ -2,6 +2,7 @@ package no.finn.unleash.repository;
import java.io.IOException;
import java.util.Collection;
import no.finn.unleash.Toggle;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -24,7 +25,7 @@ public class HTTPToggleRepository implements ToggleRepository {
}
@Override
public Toggle getToggle(final String name) throws ToggleException {
public final Toggle getToggle(final String name) throws ToggleException {
try {
for (Toggle toggle : fetchToggles()) {
if (name.equals(toggle.getName())) {
@ -40,7 +41,7 @@ public class HTTPToggleRepository implements ToggleRepository {
}
@Override
public Collection<Toggle> getToggles() {
public final Collection<Toggle> getToggles() {
try {
return fetchToggles();
} catch (IOException e) {

View File

@ -2,12 +2,16 @@ package no.finn.unleash.repository;
import java.io.Reader;
import java.util.Collection;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import no.finn.unleash.Toggle;
public final class JsonToggleParser {
private JsonToggleParser() {
}
public static Toggle toToggle(String jsonString) {
Gson gson = new GsonBuilder().create();
return gson.fromJson(jsonString, Toggle.class);
@ -41,7 +45,7 @@ public final class JsonToggleParser {
public static ToggleCollection collectionFormJson(Reader reader) {
Gson gson = new GsonBuilder().create();
ToggleCollection gsonCollection = gson.fromJson(reader,ToggleCollection.class);
ToggleCollection gsonCollection = gson.fromJson(reader, ToggleCollection.class);
return new ToggleCollection(gsonCollection.getFeatures());
}
}

View File

@ -15,6 +15,7 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import no.finn.unleash.Toggle;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -52,12 +53,12 @@ public class PollingToggleRepository implements ToggleRepository {
}
@Override
public Toggle getToggle(final String name){
public final Toggle getToggle(final String name){
return togglesCache.get(name);
}
@Override
public Collection<Toggle> getToggles() {
public final Collection<Toggle> getToggles() {
return Collections.unmodifiableCollection(togglesCache.values());
}

View File

@ -4,6 +4,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import no.finn.unleash.Toggle;
final class ToggleCollection {

View File

@ -1,6 +1,7 @@
package no.finn.unleash.repository;
import java.util.Collection;
import no.finn.unleash.Toggle;
public interface ToggleRepository {

View File

@ -2,9 +2,8 @@ package no.finn.unleash;
import java.net.URI;
import java.util.Random;
import no.finn.unleash.repository.FeatureToggleRepository;
import no.finn.unleash.repository.HTTPToggleRepository;
import no.finn.unleash.repository.PollingToggleRepository;
import no.finn.unleash.repository.ToggleRepository;
public class ManualTesting {

View File

@ -7,9 +7,12 @@ import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.*;
import static org.mockito.Mockito.anyMap;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
public class UnleashTest {

View File

@ -1,11 +1,10 @@
package no.finn.unleash.repository;
import java.net.URI;
import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.*;
public class HttpToggleFetcherTest {

View File

@ -5,8 +5,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import no.finn.unleash.Toggle;
import org.junit.Test;