Skip to content

Commit

Permalink
Fix import for ARLAS 18
Browse files Browse the repository at this point in the history
  • Loading branch information
@alainbodiguel
alainbodiguel committed Jun 24, 2021
1 parent a86701c commit d51e7f0
Show file tree
Hide file tree
Showing 14 changed files with 37 additions and 37 deletions.
Binary file removed arlas-persistence-access-2020-09-28.log.gz
View file
Binary file not shown.
Binary file removed arlas-persistence-access-2020-09-29.log.gz
View file
Binary file not shown.
Binary file removed arlas-persistence-access-2020-09-30.log.gz
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions ...re/src/main/java/io/arlas/persistence/server/app/ArlasPersistenceServerConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

import com.fasterxml.jackson.annotation.JsonProperty;
import com.smoketurner.dropwizard.zipkin.ZipkinFactory;
import io.arlas.server.app.ArlasAuthConfiguration;
import io.arlas.server.app.ArlasCorsConfiguration;
import io.arlas.server.exceptions.ArlasConfigurationException;
import io.arlas.server.utils.StringUtil;
import io.arlas.server.core.app.ArlasAuthConfiguration;
import io.arlas.server.core.app.ArlasCorsConfiguration;
import io.arlas.server.core.exceptions.ArlasConfigurationException;
import io.arlas.server.core.utils.StringUtil;
import io.dropwizard.Configuration;
import io.dropwizard.db.DataSourceFactory;
import io.federecio.dropwizard.swagger.SwaggerBundleConfiguration;
Expand Down
2 changes: 1 addition & 1 deletion ...s-persistence-core/src/main/java/io/arlas/persistence/server/core/PersistenceService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import io.arlas.persistence.server.model.Data;
import io.arlas.persistence.server.model.IdentityParam;
import io.arlas.persistence.server.utils.SortOrder;
import io.arlas.server.exceptions.ArlasException;
import io.arlas.server.core.exceptions.ArlasException;
import org.apache.commons.lang3.tuple.Pair;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...sistence-core/src/main/java/io/arlas/persistence/server/exceptions/ConflictException.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package io.arlas.persistence.server.exceptions;

import io.arlas.server.exceptions.ArlasException;
import io.arlas.server.core.exceptions.ArlasException;

import javax.ws.rs.core.Response;

Expand Down
2 changes: 1 addition & 1 deletion ...sistence-core/src/main/java/io/arlas/persistence/server/exceptions/ForbidenException.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

package io.arlas.persistence.server.exceptions;

import io.arlas.server.exceptions.ArlasException;
import io.arlas.server.core.exceptions.ArlasException;

import javax.ws.rs.core.Response;

Expand Down
4 changes: 2 additions & 2 deletions ...core/src/main/java/io/arlas/persistence/server/impl/FileSystemPersistenceServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import io.arlas.persistence.server.model.IdentityParam;
import io.arlas.persistence.server.utils.SortOrder;
import io.arlas.persistence.server.utils.UUIDHelper;
import io.arlas.server.exceptions.ArlasException;
import io.arlas.server.exceptions.NotFoundException;
import io.arlas.server.core.exceptions.ArlasException;
import io.arlas.server.core.exceptions.NotFoundException;
import org.apache.commons.lang3.tuple.Pair;

import java.io.File;
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/io/arlas/persistence/server/impl/GoogleFirestorePersistenceServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import io.arlas.persistence.server.model.Data;
import io.arlas.persistence.server.model.IdentityParam;
import io.arlas.persistence.server.utils.SortOrder;
import io.arlas.server.exceptions.ArlasException;
import io.arlas.server.exceptions.NotFoundException;
import io.arlas.server.core.exceptions.ArlasException;
import io.arlas.server.core.exceptions.NotFoundException;
import org.apache.commons.lang3.tuple.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
4 changes: 2 additions & 2 deletions ...-core/src/main/java/io/arlas/persistence/server/impl/HibernatePersistenceServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import io.arlas.persistence.server.model.IdentityParam;
import io.arlas.persistence.server.utils.SortOrder;
import io.arlas.persistence.server.utils.UUIDHelper;
import io.arlas.server.exceptions.ArlasException;
import io.arlas.server.exceptions.NotFoundException;
import io.arlas.server.core.exceptions.ArlasException;
import io.arlas.server.core.exceptions.NotFoundException;
import io.dropwizard.hibernate.AbstractDAO;
import org.apache.commons.lang3.tuple.Pair;
import org.hibernate.SessionFactory;
Expand Down
2 changes: 1 addition & 1 deletion arlas-persistence-rest/src/main/java/io/arlas/persistence/rest/DataHALService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import io.arlas.persistence.server.model.Data;
import io.arlas.persistence.server.model.IdentityParam;
import io.arlas.persistence.server.utils.SortOrder;
import io.arlas.server.utils.StringUtil;
import io.arlas.server.core.utils.StringUtil;
import org.apache.commons.lang3.tuple.Pair;

import javax.ws.rs.core.UriInfo;
Expand Down
28 changes: 14 additions & 14 deletions arlas-persistence-rest/src/main/java/io/arlas/persistence/rest/PersistenceRestService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
import io.arlas.persistence.server.core.PersistenceService;
import io.arlas.persistence.server.model.IdentityParam;
import io.arlas.persistence.server.utils.SortOrder;
import io.arlas.server.exceptions.ArlasException;
import io.arlas.server.exceptions.NotFoundException;
import io.arlas.server.model.response.Error;
import io.arlas.server.utils.ResponseFormatter;
import io.arlas.server.core.exceptions.ArlasException;
import io.arlas.server.core.exceptions.NotFoundException;
import io.arlas.server.core.model.response.Error;
import io.arlas.server.core.utils.ResponseFormatter;
import io.dropwizard.hibernate.UnitOfWork;
import io.swagger.annotations.*;
import org.slf4j.Logger;
Expand Down Expand Up @@ -124,7 +124,7 @@ public Response list(
// --------------------------------------------------------
// ----------------------- FORM -----------------------
// --------------------------------------------------------
@ApiParam(name = "pretty", value = io.arlas.server.app.Documentation.FORM_PRETTY,
@ApiParam(name = "pretty", value = io.arlas.server.core.app.Documentation.FORM_PRETTY,
defaultValue = "false")
@QueryParam(value = "pretty") Boolean pretty
) throws ArlasException {
Expand Down Expand Up @@ -166,7 +166,7 @@ public Response getByKey(
// --------------------------------------------------------
// ----------------------- FORM -----------------------
// --------------------------------------------------------
@ApiParam(name = "pretty", value = io.arlas.server.app.Documentation.FORM_PRETTY,
@ApiParam(name = "pretty", value = io.arlas.server.core.app.Documentation.FORM_PRETTY,
defaultValue = "false")
@QueryParam(value = "pretty") Boolean pretty
) throws ArlasException {
Expand Down Expand Up @@ -206,7 +206,7 @@ public Response existsByKey(
// --------------------------------------------------------
// ----------------------- FORM -----------------------
// --------------------------------------------------------
@ApiParam(name = "pretty", value = io.arlas.server.app.Documentation.FORM_PRETTY,
@ApiParam(name = "pretty", value = io.arlas.server.core.app.Documentation.FORM_PRETTY,
defaultValue = "false")
@QueryParam(value = "pretty") Boolean pretty
) throws ArlasException {
Expand Down Expand Up @@ -248,7 +248,7 @@ public Response getById(
// --------------------------------------------------------
// ----------------------- FORM -----------------------
// --------------------------------------------------------
@ApiParam(name = "pretty", value = io.arlas.server.app.Documentation.FORM_PRETTY,
@ApiParam(name = "pretty", value = io.arlas.server.core.app.Documentation.FORM_PRETTY,
defaultValue = "false")
@QueryParam(value = "pretty") Boolean pretty
) throws ArlasException {
Expand Down Expand Up @@ -285,7 +285,7 @@ public Response existsById(
// --------------------------------------------------------
// ----------------------- FORM -----------------------
// --------------------------------------------------------
@ApiParam(name = "pretty", value = io.arlas.server.app.Documentation.FORM_PRETTY,
@ApiParam(name = "pretty", value = io.arlas.server.core.app.Documentation.FORM_PRETTY,
defaultValue = "false")
@QueryParam(value = "pretty") Boolean pretty
) throws ArlasException {
Expand Down Expand Up @@ -326,7 +326,7 @@ public Response getGroupsByZone(
// --------------------------------------------------------
// ----------------------- FORM -----------------------
// --------------------------------------------------------
@ApiParam(name = "pretty", value = io.arlas.server.app.Documentation.FORM_PRETTY,
@ApiParam(name = "pretty", value = io.arlas.server.core.app.Documentation.FORM_PRETTY,
defaultValue = "false")
@QueryParam(value = "pretty") Boolean pretty
) {
Expand Down Expand Up @@ -377,7 +377,7 @@ public Response create(
// --------------------------------------------------------
// ----------------------- FORM -----------------------
// --------------------------------------------------------
@ApiParam(name = "pretty", value = io.arlas.server.app.Documentation.FORM_PRETTY,
@ApiParam(name = "pretty", value = io.arlas.server.core.app.Documentation.FORM_PRETTY,
defaultValue = "false")
@QueryParam(value = "pretty") Boolean pretty
) throws ArlasException {
Expand Down Expand Up @@ -440,7 +440,7 @@ public Response update(
// --------------------------------------------------------
// ----------------------- FORM -----------------------
// --------------------------------------------------------
@ApiParam(name = "pretty", value = io.arlas.server.app.Documentation.FORM_PRETTY,
@ApiParam(name = "pretty", value = io.arlas.server.core.app.Documentation.FORM_PRETTY,
defaultValue = "false")
@QueryParam(value = "pretty") Boolean pretty
) throws ArlasException {
Expand Down Expand Up @@ -483,7 +483,7 @@ public Response deleteById(
// --------------------------------------------------------
// ----------------------- FORM -----------------------
// --------------------------------------------------------
@ApiParam(name = "pretty", value = io.arlas.server.app.Documentation.FORM_PRETTY,
@ApiParam(name = "pretty", value = io.arlas.server.core.app.Documentation.FORM_PRETTY,
defaultValue = "false")
@QueryParam(value = "pretty") Boolean pretty
) throws ArlasException {
Expand Down Expand Up @@ -526,7 +526,7 @@ public Response delete(
// --------------------------------------------------------
// ----------------------- FORM -----------------------
// --------------------------------------------------------
@ApiParam(name = "pretty", value = io.arlas.server.app.Documentation.FORM_PRETTY,
@ApiParam(name = "pretty", value = io.arlas.server.core.app.Documentation.FORM_PRETTY,
defaultValue = "false")
@QueryParam(value = "pretty") Boolean pretty
) throws ArlasException {
Expand Down
16 changes: 8 additions & 8 deletions ...sistence-server/src/main/java/io/arlas/persistence/server/app/ArlasPersistenceServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
import io.arlas.persistence.server.impl.GoogleFirestorePersistenceServiceImpl;
import io.arlas.persistence.server.impl.HibernatePersistenceServiceImpl;
import io.arlas.persistence.server.model.Data;
import io.arlas.server.app.ArlasCorsConfiguration;
import io.arlas.server.auth.AuthenticationFilter;
import io.arlas.server.auth.AuthorizationFilter;
import io.arlas.server.exceptions.ArlasExceptionMapper;
import io.arlas.server.exceptions.ConstraintViolationExceptionMapper;
import io.arlas.server.exceptions.IllegalArgumentExceptionMapper;
import io.arlas.server.utils.InsensitiveCaseFilter;
import io.arlas.server.utils.PrettyPrintFilter;
import io.arlas.server.core.app.ArlasCorsConfiguration;
import io.arlas.server.admin.auth.AuthenticationFilter;
import io.arlas.server.admin.auth.AuthorizationFilter;
import io.arlas.server.core.exceptions.ArlasExceptionMapper;
import io.arlas.server.core.exceptions.ConstraintViolationExceptionMapper;
import io.arlas.server.core.exceptions.IllegalArgumentExceptionMapper;
import io.arlas.server.core.utils.InsensitiveCaseFilter;
import io.arlas.server.core.utils.PrettyPrintFilter;
import io.dropwizard.Application;
import io.dropwizard.assets.AssetsBundle;
import io.dropwizard.configuration.EnvironmentVariableSubstitutor;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<properties>
<!-- PROJECT-->
<arlas-server.version>17.7.0</arlas-server.version>
<arlas-server.version>18.7.0-beta.0</arlas-server.version>
<log4j.version>2.13.2</log4j.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skipTests>true</skipTests>
Expand Down

0 comments on commit d51e7f0

Please sign in to comment.