Skip to content
Permalink
Browse files

Replace imports of com.google.inject.Inject by javax.inject.Inject

Signed-off-by: Gabriel Roldan <gabriel.roldan@gmail.com>
  • Loading branch information
groldan committed Jun 18, 2019
1 parent 02d1e9d commit 5df55e0c5c9f268dc3005aa878908b8cbdcc9590
@@ -9,6 +9,8 @@
*/
package org.locationtech.geogig.di;

import javax.inject.Inject;

import org.locationtech.geogig.repository.AbstractGeoGigOp;
import org.locationtech.geogig.repository.Context;
import org.locationtech.geogig.repository.Platform;
@@ -24,7 +26,6 @@
import org.locationtech.geogig.storage.RefDatabase;

import com.google.common.base.Preconditions;
import com.google.inject.Inject;
import com.google.inject.Provider;

import lombok.NonNull;
@@ -13,6 +13,8 @@
import java.util.NoSuchElementException;
import java.util.Optional;

import javax.inject.Inject;

import org.locationtech.geogig.plumbing.ResolveGeogigURI;
import org.locationtech.geogig.repository.Context;
import org.locationtech.geogig.repository.Hints;
@@ -27,7 +29,6 @@
import org.locationtech.geogig.storage.fs.IniFileConfigDatabase;

import com.google.inject.AbstractModule;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Scopes;

@@ -16,14 +16,15 @@
import java.net.URISyntaxException;
import java.util.Optional;

import javax.inject.Inject;

import org.eclipse.jdt.annotation.Nullable;
import org.locationtech.geogig.repository.AbstractGeoGigOp;
import org.locationtech.geogig.repository.Hints;
import org.locationtech.geogig.repository.Platform;

import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.inject.Inject;

import lombok.NonNull;

@@ -12,13 +12,13 @@
import java.net.URI;
import java.util.Optional;

import javax.inject.Inject;

import org.locationtech.geogig.repository.AbstractGeoGigOp;
import org.locationtech.geogig.repository.RepositoryFinder;
import org.locationtech.geogig.repository.RepositoryResolver;
import org.locationtech.geogig.storage.ConfigDatabase;

import com.google.inject.Inject;

/**
* Resolves the name of the repository.
* <p>
@@ -22,6 +22,8 @@
import java.util.Map.Entry;
import java.util.Optional;

import javax.inject.Inject;

import org.locationtech.geogig.di.CanRunDuringConflict;
import org.locationtech.geogig.model.ObjectId;
import org.locationtech.geogig.model.Ref;
@@ -47,7 +49,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import com.google.common.io.Files;
import com.google.inject.Inject;

import lombok.AccessLevel;
import lombok.Setter;
@@ -17,6 +17,8 @@
import java.util.Map;
import java.util.Optional;

import javax.inject.Inject;

import org.locationtech.geogig.model.Node;
import org.locationtech.geogig.model.NodeRef;
import org.locationtech.geogig.model.ObjectId;
@@ -53,7 +55,6 @@

import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.inject.Inject;

import lombok.Getter;
import lombok.experimental.Accessors;
@@ -27,6 +27,8 @@
import java.util.stream.Stream;
import java.util.stream.StreamSupport;

import javax.inject.Inject;

import org.eclipse.jdt.annotation.Nullable;
import org.locationtech.geogig.model.DiffEntry;
import org.locationtech.geogig.model.DiffEntry.ChangeType;
@@ -57,7 +59,6 @@
import com.google.common.base.Stopwatch;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.inject.Inject;

import lombok.NonNull;

@@ -24,6 +24,8 @@
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Function;

import javax.inject.Inject;

import org.eclipse.jdt.annotation.Nullable;
import org.locationtech.geogig.feature.FeatureType;
import org.locationtech.geogig.model.DiffEntry;
@@ -65,7 +67,6 @@
import com.google.common.collect.Iterators;
import com.google.common.collect.Maps;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.inject.Inject;

import lombok.NonNull;

@@ -17,6 +17,8 @@
import java.util.NoSuchElementException;
import java.util.Optional;

import javax.inject.Inject;

import org.eclipse.jdt.annotation.Nullable;
import org.locationtech.geogig.plumbing.ResolveGeogigURI;
import org.locationtech.geogig.repository.Hints;
@@ -27,7 +29,6 @@
import org.locationtech.geogig.storage.ConfigException.StatusCode;

import com.google.common.base.Preconditions;
import com.google.inject.Inject;

public class IniFileConfigDatabase extends AbstractStore implements ConfigDatabase {

@@ -52,7 +52,7 @@
import com.google.common.collect.Iterators;
import com.google.common.io.ByteArrayDataOutput;
import com.google.common.io.ByteStreams;
import com.google.inject.Inject;
import javax.inject.Inject;

import lombok.NonNull;

@@ -114,7 +114,7 @@
import com.google.common.collect.SetMultimap;
import com.google.common.collect.Sets;
import com.google.common.io.ByteStreams;
import com.google.inject.Inject;
import javax.inject.Inject;

import cucumber.api.DataTable;
import cucumber.api.java.en.Given;

0 comments on commit 5df55e0

Please sign in to comment.
You can’t perform that action at this time.