diff --git a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java index f7d364ae6376524ef892de3353d699547417717e..ae8d77dd0db1eac32d0587fea353eac9fcae8b17 100644 --- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java +++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/DatabaseUtils.java @@ -1,5 +1,5 @@ /* - * This file is a part of the CaosDB Project. + * This file is a part of the LinkAhead Project. * * Copyright (C) 2018 Research Group Biomedical Physics, * Max-Planck-Institute for Dynamics and Self-Organization Göttingen @@ -19,7 +19,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -package org.caosdb.server.database.backend.implementation.MySQL; +package org.linkahead.server.database.backend.implementation.MySQL; import com.google.common.base.Objects; import java.sql.ResultSet; @@ -34,19 +34,19 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.stream.Collectors; -import org.caosdb.server.database.proto.FlatProperty; -import org.caosdb.server.database.proto.ProtoProperty; -import org.caosdb.server.database.proto.SparseEntity; -import org.caosdb.server.database.proto.VerySparseEntity; -import org.caosdb.server.datatype.AbstractCollectionDatatype; -import org.caosdb.server.datatype.CollectionValue; -import org.caosdb.server.datatype.GenericValue; -import org.caosdb.server.entity.EntityID; -import org.caosdb.server.entity.EntityInterface; -import org.caosdb.server.entity.Message; -import org.caosdb.server.entity.RetrieveEntity; -import org.caosdb.server.entity.StatementStatus; -import org.caosdb.server.entity.wrapper.Property; +import org.linkahead.server.database.proto.FlatProperty; +import org.linkahead.server.database.proto.ProtoProperty; +import org.linkahead.server.database.proto.SparseEntity; +import org.linkahead.server.database.proto.VerySparseEntity; +import org.linkahead.server.datatype.AbstractCollectionDatatype; +import org.linkahead.server.datatype.CollectionValue; +import org.linkahead.server.datatype.GenericValue; +import org.linkahead.server.entity.EntityID; +import org.linkahead.server.entity.EntityInterface; +import org.linkahead.server.entity.Message; +import org.linkahead.server.entity.RetrieveEntity; +import org.linkahead.server.entity.StatementStatus; +import org.linkahead.server.entity.wrapper.Property; public class DatabaseUtils { diff --git a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/Replacement.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/Replacement.java index 61e431bab60b9973f6aa1f0b824ffc3e3b60744e..e604d3b935f0a2d66a7293a623e14398cc605759 100644 --- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/Replacement.java +++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/Replacement.java @@ -1,5 +1,5 @@ /* - * This file is a part of the CaosDB Project. + * This file is a part of the LinkAhead Project. * * Copyright (C) 2023 IndiScale GmbH <info@indiscale.com> * Copyright (C) 2023 Timm Fitschen <t.fitschen@indiscale.com> @@ -17,13 +17,13 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <https://www.gnu.org/licenses/>. */ -package org.caosdb.server.database.backend.implementation.MySQL; +package org.linkahead.server.database.backend.implementation.MySQL; -import org.caosdb.server.datatype.ReferenceValue; -import org.caosdb.server.entity.EntityID; -import org.caosdb.server.entity.RetrieveEntity; -import org.caosdb.server.entity.StatementStatusInterface; -import org.caosdb.server.entity.wrapper.Property; +import org.linkahead.server.datatype.ReferenceValue; +import org.linkahead.server.entity.EntityID; +import org.linkahead.server.entity.RetrieveEntity; +import org.linkahead.server.entity.StatementStatusInterface; +import org.linkahead.server.entity.wrapper.Property; enum ReplacementStatus implements StatementStatusInterface { REPLACEMENT diff --git a/src/main/java/org/caosdb/server/grpc/LoggingInterceptor.java b/src/main/java/org/caosdb/server/grpc/LoggingInterceptor.java index 0d6ce4631f7b89bee408b1c94e0107bf584765de..cb08862966b9cbde7739966693936ea29081aab5 100644 --- a/src/main/java/org/caosdb/server/grpc/LoggingInterceptor.java +++ b/src/main/java/org/caosdb/server/grpc/LoggingInterceptor.java @@ -9,8 +9,8 @@ import io.grpc.ServerCall.Listener; import io.grpc.ServerCallHandler; import io.grpc.ServerInterceptor; import java.net.SocketAddress; -import org.caosdb.server.CaosDBServer; -import org.caosdb.server.ServerProperties; +import org.linkahead.server.LinkAheadServer; +import org.linkahead.server.ServerProperties; import org.restlet.routing.Template; import org.restlet.util.Resolver; import org.slf4j.Logger; @@ -56,7 +56,7 @@ public class LoggingInterceptor implements ServerInterceptor { private Template template; public LoggingInterceptor() { - String format = CaosDBServer.getServerProperty(ServerProperties.KEY_GRPC_RESPONSE_LOG_FORMAT); + String format = LinkAheadServer.getServerProperty(ServerProperties.KEY_GRPC_RESPONSE_LOG_FORMAT); if ("OFF".equalsIgnoreCase(format)) { this.template = null; } else if (format != null) {