Align Visibility Modifiers in Odm Tests

Issue gh-750
This commit is contained in:
Josh Cummings
2023-05-09 17:21:07 -06:00
parent 04ee85de9c
commit 9cf682ed54
6 changed files with 32 additions and 21 deletions

View File

@@ -74,13 +74,14 @@ public class ConverterFactoryTests {
private static class NullConverter implements Converter {
@Override
public <T> T convert(Object source, Class<T> toClass) throws Exception {
return null;
}
}
private static class ConverterConfigTestData {
private static final class ConverterConfigTestData {
private Class<?>[] fromClasses;
@@ -96,7 +97,7 @@ public class ConverterFactoryTests {
}
private static class ConverterTestData {
private static final class ConverterTestData {
private final Class<?> fromClass;

View File

@@ -152,7 +152,7 @@ public final class ConverterManagerTests {
this.converterManager.convert(String.class, "not a uri", URI.class);
}
private static class ConverterTestData<T> {
private static final class ConverterTestData<T> {
public final Class<T> destClass;
@@ -162,11 +162,11 @@ public final class ConverterManagerTests {
public final String syntax;
public ConverterTestData(Object sourceData, Class<T> destClass, T expectedValue) {
ConverterTestData(Object sourceData, Class<T> destClass, T expectedValue) {
this(sourceData, "", destClass, expectedValue);
}
public ConverterTestData(Object sourceData, String syntax, Class<T> destClass, T expectedValue) {
ConverterTestData(Object sourceData, String syntax, Class<T> destClass, T expectedValue) {
this.destClass = destClass;
this.sourceData = sourceData;
this.expectedValue = expectedValue;
@@ -183,6 +183,7 @@ public final class ConverterManagerTests {
private static class SquaredConverter implements Converter {
@Override
public <T> T convert(Object source, Class<T> toClass) throws Exception {
Integer intSource = null;
@@ -207,6 +208,7 @@ public final class ConverterManagerTests {
private static class CubedConverter implements Converter {
@Override
public <T> T convert(Object source, Class<T> toClass) throws Exception {
Integer intSource = null;

View File

@@ -212,7 +212,7 @@ public final class LdapTests {
private int index;
private PersonName(int index) {
PersonName(int index) {
this.index = index;
}
@@ -287,7 +287,7 @@ public final class LdapTests {
private int index;
private OrganizationalName(int index) {
OrganizationalName(int index) {
this.index = index;
}
@@ -522,7 +522,7 @@ public final class LdapTests {
private String longName;
private Flag(String shortName, String longName) {
Flag(String shortName, String longName) {
this.shortName = shortName;
this.longName = longName;
}
@@ -627,7 +627,7 @@ public final class LdapTests {
private Person[] people;
public SearchTestData(String search, SearchControls searchScope, Person[] people) {
SearchTestData(String search, SearchControls searchScope, Person[] people) {
this.search = search;
this.searchScope = searchScope;
this.people = people;
@@ -635,7 +635,7 @@ public final class LdapTests {
}
private final static class NoEntry {
private static final class NoEntry {
@SuppressWarnings("unused")
@Id
@@ -644,12 +644,12 @@ public final class LdapTests {
}
@Entry(objectClasses = "test")
private final static class NoId {
private static final class NoId {
}
@Entry(objectClasses = "test")
private final static class TwoIds {
private static final class TwoIds {
@SuppressWarnings("unused")
@Id
@@ -660,13 +660,13 @@ public final class LdapTests {
private Name secondId;
@SuppressWarnings("unused")
public TwoIds() {
TwoIds() {
}
}
@Entry(objectClasses = "test")
public final static class NoConstructor {
public static final class NoConstructor {
@SuppressWarnings("unused")
@Id
@@ -678,7 +678,7 @@ public final class LdapTests {
}
@Entry(objectClasses = "test")
public final static class AttributeOnId {
public static final class AttributeOnId {
@SuppressWarnings("unused")
@Id
@@ -688,7 +688,7 @@ public final class LdapTests {
}
@Entry(objectClasses = "test")
public final static class IdIsNotAName {
public static final class IdIsNotAName {
@SuppressWarnings("unused")
@Id
@@ -697,7 +697,7 @@ public final class LdapTests {
}
@Entry(objectClasses = "test")
public final static class MissingConverter {
public static final class MissingConverter {
@SuppressWarnings("unused")
@Id
@@ -709,7 +709,7 @@ public final class LdapTests {
}
@Entry(objectClasses = "test")
public final static class WrongClassForOc {
public static final class WrongClassForOc {
@SuppressWarnings("unused")
@Id

View File

@@ -130,7 +130,7 @@ public final class SchemaViewerTests {
private final String result;
public TestData(String flag, String value, String result) {
TestData(String flag, String value, String result) {
this.flag = flag;
this.value = value;
this.result = result;

View File

@@ -24,7 +24,7 @@ import javax.tools.JavaFileObject;
import javax.tools.StandardJavaFileManager;
import javax.tools.ToolProvider;
public class CompilerInterface {
public final class CompilerInterface {
// Compile the given file - when we can drop Java 5 we'll use the Java 6 compiler API
public static void compile(String directory, String file) throws Exception {
@@ -39,4 +39,8 @@ public class CompilerInterface {
fileManager.close();
}
private CompilerInterface() {
}
}

View File

@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
// Added because the close down of the embedded Apache DS used
// for unit testing does not seem to free up its port.
public class GetFreePort {
public final class GetFreePort {
private static Logger LOG = LoggerFactory.getLogger(GetFreePort.class);
@@ -38,4 +38,8 @@ public class GetFreePort {
return port;
}
private GetFreePort() {
}
}