SourceIdentifier has lost the public constructor. Use the static
factory method instead.
Change-Id: I634f8b8c9e9f7b92a4edbbad4580fb1bdf179eaf
Signed-off-by: Robert Varga <rovarga@cisco.com>
package org.opendaylight.controller.config.facade.xml.osgi;
import com.google.common.base.Charsets;
package org.opendaylight.controller.config.facade.xml.osgi;
import com.google.common.base.Charsets;
+import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.BiMap;
import com.google.common.collect.Maps;
import com.google.common.base.Preconditions;
import com.google.common.collect.BiMap;
import com.google.common.collect.Maps;
@Override
public String getModuleSource(final org.opendaylight.yangtools.yang.model.api.ModuleIdentifier moduleIdentifier) {
final CheckedFuture<? extends YangTextSchemaSource, SchemaSourceException> source = sourceProvider.getSource(
@Override
public String getModuleSource(final org.opendaylight.yangtools.yang.model.api.ModuleIdentifier moduleIdentifier) {
final CheckedFuture<? extends YangTextSchemaSource, SchemaSourceException> source = sourceProvider.getSource(
- moduleIdentifier.getRevision() == null ?
- new SourceIdentifier(moduleIdentifier.getName()) :
- new SourceIdentifier(moduleIdentifier.getName(),
- QName.formattedRevision(moduleIdentifier.getRevision())));
+ SourceIdentifier.create(moduleIdentifier.getName(), Optional.fromNullable(
+ QName.formattedRevision(moduleIdentifier.getRevision()))));
try {
final YangTextSchemaSource yangTextSchemaSource = source.checkedGet();
try {
final YangTextSchemaSource yangTextSchemaSource = source.checkedGet();
package org.opendaylight.controller.cluster.schema.provider.impl;
import com.google.common.annotations.Beta;
package org.opendaylight.controller.cluster.schema.provider.impl;
import com.google.common.annotations.Beta;
+import com.google.common.base.Optional;
import com.google.common.io.ByteSource;
import java.io.IOException;
import java.io.Serializable;
import com.google.common.io.ByteSource;
import java.io.IOException;
import java.io.Serializable;
}
public YangTextSchemaSource getRepresentation() {
}
public YangTextSchemaSource getRepresentation() {
- return YangTextSchemaSource.delegateForByteSource(new SourceIdentifier(name, revision), ByteSource.wrap(schemaSource));
+ return YangTextSchemaSource.delegateForByteSource(SourceIdentifier.create(name, Optional.of(revision)),
+ ByteSource.wrap(schemaSource));
import akka.dispatch.ExecutionContexts;
import akka.dispatch.Futures;
import akka.dispatch.ExecutionContexts;
import akka.dispatch.Futures;
+import com.google.common.base.Optional;
import com.google.common.io.ByteSource;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.io.ByteSource;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.util.concurrent.MoreExecutors;
public class RemoteSchemaProviderTest {
public class RemoteSchemaProviderTest {
- private static final SourceIdentifier ID = new SourceIdentifier("Test", "2015-10-30");
+ private static final SourceIdentifier ID = SourceIdentifier.create("Test", Optional.of("2015-10-30"));
private RemoteSchemaProvider remoteSchemaProvider;
private RemoteYangTextSourceProvider mockedRemoteSchemaRepository;
private RemoteSchemaProvider remoteSchemaProvider;
private RemoteYangTextSourceProvider mockedRemoteSchemaRepository;
assertTrue(sourceFuture.isDone());
sourceFuture.checkedGet();
}
assertTrue(sourceFuture.isDone());
sourceFuture.checkedGet();
}
-}
\ No newline at end of file
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import com.google.common.base.Optional;
import com.google.common.io.ByteSource;
import com.google.common.util.concurrent.Futures;
import java.util.Collections;
import com.google.common.io.ByteSource;
import com.google.common.util.concurrent.Futures;
import java.util.Collections;
public class RemoteYangTextSourceProviderImplTest {
public class RemoteYangTextSourceProviderImplTest {
- private static final SourceIdentifier ID = new SourceIdentifier("Test", "2015-10-30");
+ private static final SourceIdentifier ID = SourceIdentifier.create("Test", Optional.of("2015-10-30"));
private RemoteYangTextSourceProviderImpl remoteRepository;
private SchemaRepository mockedLocalRepository;
private RemoteYangTextSourceProviderImpl remoteRepository;
private SchemaRepository mockedLocalRepository;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
-import com.google.common.base.Charsets;
+import com.google.common.base.Optional;
import com.google.common.io.ByteSource;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import com.google.common.io.ByteSource;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.nio.charset.StandardCharsets;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
public void setUp() {
String source = "Test source.";
schemaSource = YangTextSchemaSource.delegateForByteSource(
public void setUp() {
String source = "Test source.";
schemaSource = YangTextSchemaSource.delegateForByteSource(
- new SourceIdentifier("test", "2015-10-30"), ByteSource.wrap(source.getBytes(Charsets.UTF_8)));
+ SourceIdentifier.create("test", Optional.of("2015-10-30")),
+ ByteSource.wrap(source.getBytes(StandardCharsets.UTF_8)));