* Use <?> instead of <? extends Object>.
* Delete unnecessary semi-colons.
* Drop public static from interface members (they're the default).
* Drop final from static methods (it's the default).
* Drop private from enum constructors (it's the default).
* Collapse common exception handlers.
* Clean up obsolete imports.
Change-Id: I8f7f74a126f558cba0a99fd0b7376cfdbccc4390
Signed-off-by: Stephen Kitt <skitt@redhat.com>
}
}
- public static Object construct(final Constructor<? extends Object> constructor, final List<Object> objects)
+ public static Object construct(final Constructor<?> constructor, final List<Object> objects)
throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
final Object[] initargs = objects.toArray();
return constructor.newInstance(initargs);
public interface Invoker {
ListenableFuture<?> invokeExecutor( ListeningExecutorService executor,
CountDownLatch blockingLatch );
- };
+ }
public static final Invoker SUBMIT_CALLABLE = new Invoker() {
@Override
interface InitialInvoker {
void invokeExecutor( ListeningExecutorService executor, Runnable task );
- };
+ }
static final InitialInvoker SUBMIT = new InitialInvoker() {
@Override
*/
public interface RpcError {
- public enum ErrorSeverity {
+ enum ErrorSeverity {
ERROR,
WARNING
}
- public enum ErrorType {
+ enum ErrorType {
/**
* Indicates an error occurred during transport of data, eg over the network.
*/
* @param children Child nodes
* @return Best estimate of the collection size required to hold all the children.
*/
- protected static final int childSizeHint(final Iterable<?> children) {
+ protected static int childSizeHint(final Iterable<?> children) {
return (children instanceof Collection) ? ((Collection<?>) children).size() : UNKNOWN_SIZE;
}
return Optional.fromNullable(getChildFromData(castData(), childId, getVersion()));
}
- static final TreeNode getChildFromData(final NormalizedNodeContainer<?, PathArgument, NormalizedNode<?, ?>> data,
+ static TreeNode getChildFromData(final NormalizedNodeContainer<?, PathArgument, NormalizedNode<?, ?>> data,
final PathArgument childId, final Version version) {
final Optional<NormalizedNode<?, ?>> child = data.getChild(childId);
return child.isPresent() ? TreeNodeFactory.createTreeNode(child.get(), version) : null;
}
// The stream ended prematurely so it is likely a syntax error.
throw new JsonSyntaxException(e);
- } catch (final MalformedJsonException e) {
+ } catch (final MalformedJsonException | NumberFormatException e) {
throw new JsonSyntaxException(e);
} catch (final IOException e) {
throw new JsonIOException(e);
- } catch (final NumberFormatException e) {
- throw new JsonSyntaxException(e);
} catch (StackOverflowError | OutOfMemoryError e) {
throw new JsonParseException("Failed parsing JSON source: " + reader + " to Json", e);
} finally {
package org.opendaylight.yangtools.yang.data.impl.codec;
import com.google.common.annotations.Beta;
-import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import java.io.IOException;
import java.util.ArrayDeque;
import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
import org.opendaylight.yangtools.yang.model.api.ListSchemaNode;
import org.opendaylight.yangtools.yang.model.api.NotificationDefinition;
-import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.model.api.SchemaNode;
import org.opendaylight.yangtools.yang.model.api.SchemaPath;
}
@SuppressWarnings({ "rawtypes", "unchecked" })
- public static final TypeDefinitionAwareCodec<Object, ? extends TypeDefinition<?>> from(final TypeDefinition typeDefinition) {
+ public static TypeDefinitionAwareCodec<Object, ? extends TypeDefinition<?>> from(final TypeDefinition typeDefinition) {
return (TypeDefinitionAwareCodec)fromType(typeDefinition);
}
@SuppressWarnings("unchecked")
- public static final <T extends TypeDefinition<T>> TypeDefinitionAwareCodec<?, T> fromType(final T typeDefinition) {
+ public static <T extends TypeDefinition<T>> TypeDefinitionAwareCodec<?, T> fromType(final T typeDefinition) {
// FIXME: this is not necessary with yang.model.util.type
final T normalizedType = (T) DerivedType.from(typeDefinition);
@SuppressWarnings("rawtypes")
* @param builder Builder to which data will be written.
* @return {@link NormalizedNodeStreamWriter} which writes data
*/
- public static final NormalizedNodeStreamWriter from(final NormalizedNodeContainerBuilder<?, ?, ?, ?> builder) {
+ public static NormalizedNodeStreamWriter from(final NormalizedNodeContainerBuilder<?, ?, ?, ?> builder) {
return new ImmutableNormalizedNodeStreamWriter(builder);
}
* @param result {@link NormalizedNodeResult} object which will hold result value.
* @return {@link NormalizedNodeStreamWriter} which will write item to supplied result holder.
*/
- public static final NormalizedNodeStreamWriter from(final NormalizedNodeResult result) {
+ public static NormalizedNodeStreamWriter from(final NormalizedNodeResult result) {
return new ImmutableNormalizedNodeStreamWriter(result);
}
// .build())
.build();
- ;
builder.withChild(choice);
// This should fail, child from case
// .build())
.build();
- ;
builder.withChild(choice);
// This should fail, child from case
import org.opendaylight.yangtools.util.UnmodifiableCollection;
import org.opendaylight.yangtools.yang.common.QName;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode;
import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder;
-import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableAugmentationNodeBuilder;
import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableChoiceNodeBuilder;
public static final QName TWO_QNAME = QName.create(TEST_QNAME, "two");
public static final QName THREE_QNAME = QName.create(TEST_QNAME, "three");
- public static final InputStream getDatastoreTestInputStream() {
+ public static InputStream getDatastoreTestInputStream() {
return RetestModel.class.getResourceAsStream(DATASTORE_TEST_YANG);
}
inMemoryDataTree.setSchemaContext(schemaContext);
}
- public static final InputStream getDatastoreTestInputStream() {
+ public static InputStream getDatastoreTestInputStream() {
return getInputStream(ODL_DATASTORE_TEST_YANG);
}
inMemoryDataTree.commit(inMemoryDataTree.prepare(modificationTree));
}
- public static final InputStream getDatastoreTestInputStream() {
+ public static InputStream getDatastoreTestInputStream() {
return getInputStream(CONSTRAINTS_VALIDATION_TEST_YANG);
}
throw new UnsupportedOperationException();
}
- public static final InputStream getDatastoreTestInputStream() {
+ public static InputStream getDatastoreTestInputStream() {
return TestModel.class.getResourceAsStream(DATASTORE_TEST_YANG);
}
return dataSchemaNode;
}
- static final DataSchemaNode findChildSchemaNode(final DataNodeContainer parent, final QName child) {
+ static DataSchemaNode findChildSchemaNode(final DataNodeContainer parent, final QName child) {
DataSchemaNode potential = parent.getDataChildByName(child);
if (potential == null) {
Iterable<ChoiceSchemaNode> choices = FluentIterable.from(
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Arrays;
-import java.util.List;
import java.util.Properties;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
private final String keyword;
- private Deviate(final String keyword) {
+ Deviate(final String keyword) {
this.keyword = Preconditions.checkNotNull(keyword);
}
private final int value;
- private Costs(final int value) {
+ Costs(final int value) {
this.value = value;
}
* @param reference Reference of Type
* @param path Schema path to type definition.
*/
- public static final Builder builder(final QName typeName, final TypeDefinition<?> baseType,
+ public static Builder builder(final QName typeName, final TypeDefinition<?> baseType,
final Optional<String> description, final Optional<String> reference, final SchemaPath path) {
return new Builder(typeName, baseType, description.or(""), reference.or(""), path);
}
* a node representing LeafSchemaNode
* @return concrete type definition of node value
*/
- private static TypeDefinition<? extends Object> typeDefinition(final LeafSchemaNode node) {
+ private static TypeDefinition<?> typeDefinition(final LeafSchemaNode node) {
TypeDefinition<?> baseType = node.getType();
while (baseType.getBaseType() != null) {
baseType = baseType.getBaseType();
* a node representing LeafListSchemaNode
* @return concrete type definition of node value
*/
- private static TypeDefinition<? extends Object> typeDefinition(final LeafListSchemaNode node) {
+ private static TypeDefinition<?> typeDefinition(final LeafListSchemaNode node) {
TypeDefinition<?> baseType = node.getType();
while (baseType.getBaseType() != null) {
baseType = baseType.getBaseType();
* a node representing DataSchemaNode
* @return concrete type definition of node value
*/
- private static TypeDefinition<? extends Object> typeDefinition(final DataSchemaNode node) {
+ private static TypeDefinition<?> typeDefinition(final DataSchemaNode node) {
if (node instanceof LeafListSchemaNode) {
return typeDefinition((LeafListSchemaNode) node);
} else if (node instanceof LeafSchemaNode) {
throw new UnsupportedOperationException("Utility class");
}
- public static final Optional<SchemaNode> getOriginalIfPossible(final SchemaNode node) {
+ public static Optional<SchemaNode> getOriginalIfPossible(final SchemaNode node) {
if(node instanceof DerivableSchemaNode) {
@SuppressWarnings("unchecked")
final Optional<SchemaNode> ret = (Optional<SchemaNode>) (((DerivableSchemaNode) node).getOriginal());
return Optional.absent();
}
- public static final SchemaNode getRootOriginalIfPossible(final SchemaNode data) {
+ public static SchemaNode getRootOriginalIfPossible(final SchemaNode data) {
Optional<SchemaNode> previous = Optional.absent();
Optional<SchemaNode> next = getOriginalIfPossible(data);
while(next.isPresent()) {
throw new UnsupportedOperationException();
}
- private final static Number resolve(final Number number) {
+ private static Number resolve(final Number number) {
Preconditions.checkArgument(!(number instanceof UnresolvedNumber));
return number;
}
private final ModelProcessingPhase previousPhase;
- private ModelProcessingPhase(@Nullable ModelProcessingPhase previous) {
+ ModelProcessingPhase(@Nullable ModelProcessingPhase previous) {
this.previousPhase = previous;
}
@Override
public abstract String toString();
- public static final DeclarationInTextSource inSource(String sourceName) {
+ public static DeclarationInTextSource inSource(String sourceName) {
return new InSource(sourceName);
}
- public static final DeclarationInTextSource atLine(String sourceName, int line) {
+ public static DeclarationInTextSource atLine(String sourceName, int line) {
return new AtLine(sourceName, line);
}
- public static final DeclarationInTextSource atPosition(String sourceName, int line, int position) {
+ public static DeclarationInTextSource atPosition(String sourceName, int line, int position) {
return new AtPosition(sourceName, line,position);
}
public interface ValidationBundlesNamespace extends
IdentifierNamespace<ValidationBundlesNamespace.ValidationBundleType, Collection<?>> {
- public static enum ValidationBundleType {
+ enum ValidationBundleType {
/**
* whether a node is suitable refine substatement
*/
this.supportedValidation = ImmutableMap.copyOf(supportedValidation);
}
- public static final Builder builder() {
+ public static Builder builder() {
return new Builder();
}
private final QName name;
private final QName argument;
- private SupportedExtensionsMapping(final String namespace, final String revision,
+ SupportedExtensionsMapping(final String namespace, final String revision,
final Class<? extends DeclaredStatement<?>> declared,
final Class<? extends EffectiveStatement<?, ?>> effective, final String nameStr,
final String argumentStr) {
private final DateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
private final YangParserImpl parser = new YangParserImpl();
- private final SchemaContext createContext(final String... resources) throws IOException, YangSyntaxErrorException {
+ private SchemaContext createContext(final String... resources) throws IOException, YangSyntaxErrorException {
final List<ByteSource> srcs = new ArrayList<>(resources.length);
for (String resource : resources) {
srcs.add(Resources.asByteSource(getClass().getResource(resource)));
Code Review / yangtools.git / commitdiff