Skip to content

Commit 67e5fef

Browse files
Item 7490: upgrade log4j (#72)
1 parent 46e2c5d commit 67e5fef

File tree

8 files changed

+14
-15
lines changed

8 files changed

+14
-15
lines changed

src/org/labkey/trialshare/ITNSpecimenRequestCustomizer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.labkey.trialshare;
22

3-
import org.apache.log4j.Logger;
3+
import org.apache.logging.log4j.LogManager;
4+
import org.apache.logging.log4j.Logger;
45
import org.labkey.api.data.Container;
56
import org.labkey.api.data.ContainerManager;
67
import org.labkey.api.security.Group;
@@ -16,7 +17,7 @@
1617

1718
public class ITNSpecimenRequestCustomizer implements SpecimenService.SpecimenRequestCustomizer
1819
{
19-
private static final Logger LOG = Logger.getLogger(ITNSpecimenRequestCustomizer.class);
20+
private static final Logger LOG = LogManager.getLogger(ITNSpecimenRequestCustomizer.class);
2021

2122
@Override
2223
public boolean allowEmptyRequests()

src/org/labkey/trialshare/PublicationDocumentProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
*/
1616
package org.labkey.trialshare;
1717

18-
import org.apache.log4j.Logger;
18+
import org.apache.logging.log4j.LogManager;
19+
import org.apache.logging.log4j.Logger;
1920
import org.jetbrains.annotations.NotNull;
2021
import org.labkey.api.data.Container;
2122
import org.labkey.api.data.ContainerManager;
@@ -39,7 +40,7 @@
3940

4041
public class PublicationDocumentProvider implements SearchService.DocumentProvider
4142
{
42-
private static final Logger _logger = Logger.getLogger(PublicationDocumentProvider.class);
43+
private static final Logger _logger = LogManager.getLogger(PublicationDocumentProvider.class);
4344

4445
public static Container getDocumentContainer()
4546
{

src/org/labkey/trialshare/StudyDocumentProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
*/
1616
package org.labkey.trialshare;
1717

18-
import org.apache.log4j.Logger;
18+
import org.apache.logging.log4j.LogManager;
19+
import org.apache.logging.log4j.Logger;
1920
import org.jetbrains.annotations.NotNull;
2021
import org.labkey.api.data.Container;
2122
import org.labkey.api.query.QuerySchema;
@@ -36,7 +37,7 @@
3637

3738
public class StudyDocumentProvider implements SearchService.DocumentProvider
3839
{
39-
private static final Logger _logger = Logger.getLogger(StudyDocumentProvider.class);
40+
private static final Logger _logger = LogManager.getLogger(StudyDocumentProvider.class);
4041
public static Container getDocumentContainer()
4142
{
4243
return TrialShareManager.get().getCubeContainer(null);

src/org/labkey/trialshare/TrialShareController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.fasterxml.jackson.databind.ObjectReader;
2121
import org.apache.commons.lang3.BooleanUtils;
2222
import org.apache.commons.lang3.StringUtils;
23-
import org.apache.log4j.Logger;
23+
import org.apache.logging.log4j.LogManager;
2424
import org.jetbrains.annotations.NotNull;
2525
import org.jetbrains.annotations.Nullable;
2626
import org.junit.Assert;
@@ -594,7 +594,7 @@ public ApiResponse execute(TrialShareExportForm form, BindException errors) thro
594594
// todo: super important boolean false in 17.2 replaced by PHI enum. what is new correct setting? PHI.Limited
595595
FolderExportContext ctx = new FolderExportContext(getUser(), container, types.stream().map(FolderDataTypes::getDescription).collect(Collectors.toSet()),
596596
"new", false, PHI.NotPHI, false,
597-
false, false, new StaticLoggerGetter(Logger.getLogger(FolderWriterImpl.class)));
597+
false, false, new StaticLoggerGetter(LogManager.getLogger(FolderWriterImpl.class)));
598598

599599
PipeRoot root = PipelineService.get().findPipelineRoot(container);
600600
if (root == null || !root.isValid())

src/org/labkey/trialshare/TrialShareManager.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
package org.labkey.trialshare;
1818

1919
import org.apache.commons.lang3.BooleanUtils;
20-
import org.apache.log4j.Logger;
20+
import org.apache.logging.log4j.LogManager;
21+
import org.apache.logging.log4j.Logger;
2122
import org.jetbrains.annotations.NotNull;
2223
import org.jetbrains.annotations.Nullable;
2324
import org.labkey.api.collections.CaseInsensitiveHashMap;
@@ -58,7 +59,7 @@
5859
public class TrialShareManager
5960
{
6061

61-
private static final Logger _logger = Logger.getLogger(TrialShareManager.class);
62+
private static final Logger _logger = LogManager.getLogger(TrialShareManager.class);
6263
private static final TrialShareManager _instance = new TrialShareManager();
6364

6465
private TrialShareManager()

src/org/labkey/trialshare/data/FacetFilter.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
*/
1616
package org.labkey.trialshare.data;
1717

18-
import org.labkey.api.action.Marshal;
19-
import org.labkey.api.action.Marshaller;
20-
2118
/**
2219
* Created by susanh on 12/14/15.
2320
*/

src/org/labkey/trialshare/data/StudyFacetMember.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
package org.labkey.trialshare.data;
1717

1818
import java.util.List;
19-
import java.util.Map;
2019

2120
/**
2221
* Created by susanh on 12/8/15.

src/org/labkey/trialshare/query/ManageCubeObjectQueryView.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.labkey.api.data.ActionButton;
1919
import org.labkey.api.data.ButtonBar;
2020
import org.labkey.api.data.Container;
21-
import org.labkey.api.data.DataRegion;
2221
import org.labkey.api.data.TableInfo;
2322
import org.labkey.api.query.DetailsURL;
2423
import org.labkey.api.query.QueryAction;

0 commit comments

Comments
 (0)