This is an automated email from the ASF dual-hosted git repository. solomax pushed a commit to branch java11-modules in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 34aa8b0939ef4af4b5117986a37bc1f7a7fd36c8 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Tue Feb 18 00:32:32 2020 +0700 no jira: project is partially converted to use java11 modules --- openmeetings-core/src/main/java/module-info.java | 40 +++++++++++++ openmeetings-db/src/main/java/module-info.java | 66 ++++++++++++++++++++++ .../apache/openmeetings/db/dao/label/LabelDao.java | 4 +- openmeetings-util/src/main/java/module-info.java | 45 +++++++++++++++ 4 files changed, 153 insertions(+), 2 deletions(-) diff --git a/openmeetings-core/src/main/java/module-info.java b/openmeetings-core/src/main/java/module-info.java new file mode 100644 index 000000000..833be8717 --- /dev/null +++ b/openmeetings-core/src/main/java/module-info.java @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +module apache.openmeetings.core { + requires transitive apache.openmeetings.db; + + requires transitive org.apache.commons.io; + + requires transitive spring.context; + + requires kurento.client; + requires kurento.commons; + requires kurento.jsonrpc.client; + requires java.activation; + requires com.google.gson; + requires java.mail; + requires api.all; + requires org.apache.tika.parsers; + requires java.xml; + requires xstream; + + requires jodconverter.core; + requires jodconverter.local; +} diff --git a/openmeetings-db/src/main/java/module-info.java b/openmeetings-db/src/main/java/module-info.java new file mode 100644 index 000000000..2d01a8c92 --- /dev/null +++ b/openmeetings-db/src/main/java/module-info.java @@ -0,0 +1,66 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +module apache.openmeetings.db { + exports org.apache.openmeetings; + exports org.apache.openmeetings.db.dao; + exports org.apache.openmeetings.db.dao.basic; + exports org.apache.openmeetings.db.dao.calendar; + exports org.apache.openmeetings.db.dao.file; + exports org.apache.openmeetings.db.dao.label; + exports org.apache.openmeetings.db.dao.log; + exports org.apache.openmeetings.db.dao.record; + exports org.apache.openmeetings.db.dao.room; + exports org.apache.openmeetings.db.dao.server; + exports org.apache.openmeetings.db.dao.user; + exports org.apache.openmeetings.db.dto.basic; + exports org.apache.openmeetings.db.dto.calendar; + exports org.apache.openmeetings.db.dto.file; + exports org.apache.openmeetings.db.dto.record; + exports org.apache.openmeetings.db.dto.room; + exports org.apache.openmeetings.db.dto.user; + exports org.apache.openmeetings.db.entity; + exports org.apache.openmeetings.db.entity.basic; + exports org.apache.openmeetings.db.entity.calendar; + exports org.apache.openmeetings.db.entity.file; + exports org.apache.openmeetings.db.entity.label; + exports org.apache.openmeetings.db.entity.log; + exports org.apache.openmeetings.db.entity.record; + exports org.apache.openmeetings.db.entity.room; + exports org.apache.openmeetings.db.entity.server; + exports org.apache.openmeetings.db.entity.user; + exports org.apache.openmeetings.db.manager; + exports org.apache.openmeetings.db.util; + exports org.apache.openmeetings.db.util.ws; + + requires transitive apache.openmeetings.util; + requires transitive org.apache.wicket.request; + requires transitive org.apache.wicket.websocket.core; + requires transitive spring.beans; + requires transitive simple.xml; + requires transitive spring.web; + requires transitive spring.core; + + requires spring.tx; + requires spring.context; + requires java.persistence; + requires openjpa; + requires asterisk.java; + requires java.xml.bind; + requires org.apache.commons.text; +} diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java index 5c7db7d25..8560f8727 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java @@ -46,7 +46,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import org.apache.commons.collections4.CollectionUtils; import org.apache.openmeetings.db.dao.IDataProviderDao; import org.apache.openmeetings.db.entity.label.OmLanguage; import org.apache.openmeetings.db.entity.label.StringLabel; @@ -193,7 +192,8 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ } List<StringLabel> result = new ArrayList<>(labelCache.containsKey(l) ? labelCache.get(l) : new ArrayList<StringLabel>()); if (!Strings.isEmpty(search)) { - CollectionUtils.filter(result, o -> o != null && (o.getKey().contains(search) || o.getValue().contains(search))); + result = result.stream().filter(o -> o != null && (o.getKey().contains(search) || o.getValue().contains(search))) + .collect(Collectors.toList()); } return result; } diff --git a/openmeetings-util/src/main/java/module-info.java b/openmeetings-util/src/main/java/module-info.java new file mode 100644 index 000000000..72dfb3c61 --- /dev/null +++ b/openmeetings-util/src/main/java/module-info.java @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +module apache.openmeetings.util { + exports org.apache.openmeetings.util; + exports org.apache.openmeetings.util.crypt; + exports org.apache.openmeetings.util.mail; + exports org.apache.openmeetings.util.process; + exports org.apache.openmeetings.util.ws; + + requires transitive javax.servlet.api; + + requires transitive org.apache.wicket.util; + requires transitive org.apache.wicket.core; + requires transitive org.apache.wicket.extensions; + + requires transitive org.apache.commons.codec; + requires transitive org.apache.commons.lang3; + requires transitive org.apache.tika.core; + + requires transitive com.github.openjson; + requires transitive org.slf4j; + requires transitive logback.classic; + requires transitive logback.core; + requires transitive dom4j; + requires transitive jcip.annotations; + requires transitive org.bouncycastle.provider; + requires transitive java.activation; + requires transitive org.mnode.ical4j.core; +}