From 2ce34407c318596cb4d42efb9ada1cc6ca5f925e Mon Sep 17 00:00:00 2001 From: "Yi (Alan) Wang" Date: Mon, 12 Mar 2018 12:50:06 -0700 Subject: [PATCH] Fix ACE model missing license (#1023) --- .../wherehows/models/table/AccessControlEntry.java | 13 +++++++++++++ .../app/controllers/api/v2/Dataset.java | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/wherehows-dao/src/main/java/wherehows/models/table/AccessControlEntry.java b/wherehows-dao/src/main/java/wherehows/models/table/AccessControlEntry.java index b1947615e1..0f1b86e767 100644 --- a/wherehows-dao/src/main/java/wherehows/models/table/AccessControlEntry.java +++ b/wherehows-dao/src/main/java/wherehows/models/table/AccessControlEntry.java @@ -1,3 +1,16 @@ +/** + * Copyright 2015 LinkedIn Corp. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + */ package wherehows.models.table; import java.util.List; diff --git a/wherehows-frontend/app/controllers/api/v2/Dataset.java b/wherehows-frontend/app/controllers/api/v2/Dataset.java index b1596d02d5..e8bcd3c1d0 100644 --- a/wherehows-frontend/app/controllers/api/v2/Dataset.java +++ b/wherehows-frontend/app/controllers/api/v2/Dataset.java @@ -35,6 +35,7 @@ import wherehows.dao.table.DictDatasetDao; import wherehows.dao.view.DataTypesViewDao; import wherehows.dao.view.DatasetViewDao; import wherehows.dao.view.OwnerViewDao; +import wherehows.models.table.AccessControlEntry; import wherehows.models.view.DatasetCompliance; import wherehows.models.view.DatasetOwner; import wherehows.models.view.DatasetOwnership; @@ -326,7 +327,7 @@ public class Dataset extends Controller { } public static Promise getDatasetAcls(@Nonnull String datasetUrn) { - final List acls; + final List acls; try { acls = ACL_DAO.getDatasetAcls(datasetUrn); } catch (Exception e) {